Fix merge conflicts

glokta1 · glokta1 · commit 913ced722c79 · 2024-06-06T12:24:36.000+05:30
diff --git a/compiled_starters/typescript/.gitattributes b/compiled_starters/typescript/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/compiled_starters/typescript/.gitignore b/compiled_starters/typescript/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/compiled_starters/typescript/README.md b/compiled_starters/typescript/README.md
@@ -0,0 +1,35 @@
+![progress-banner](https://codecrafters.io/landing/images/default_progress_banners/shell.png)
+
+This is a starting point for TypeScript solutions to the
+["Build Your Own Shell" Challenge](https://app.codecrafters.io/courses/shell/overview).
+
+In this challenge, you'll build your own POSIX compliant shell that's capable of
+interpreting shell commands, running external programs and builtin commands like
+cd, pwd, echo and more. Along the way, you'll learn about shell command parsing,
+REPLs, builtin commands, and more.
+
+**Note**: If you're viewing this repo on GitHub, head over to
+[codecrafters.io](https://codecrafters.io) to try the challenge.
+
+# Passing the first stage
+
+The entry point for your `shell` implementation is in `app/main.ts`. Study and
+uncomment the relevant code, and push your changes to pass the first stage:
+
+```sh
+git add .
+git commit -m "pass 1st stage" # any msg
+git push origin master
+```
+
+Time to move on to the next stage!
+
+# Stage 2 & beyond
+
+Note: This section is for stages 2 and beyond.
+
+1. Ensure you have `bun (1.1)` installed locally
+1. Run `./your_shell.sh` to run your program, which is implemented in
+   `app/main.ts`.
+1. Commit your changes and run `git push origin master` to submit your solution
+   to CodeCrafters. Test output will be streamed to your terminal.
diff --git a/compiled_starters/typescript/app/main.ts b/compiled_starters/typescript/app/main.ts
@@ -0,0 +1,15 @@
+// Uncomment this block to pass the first stage
+// import { createInterface } from 'readline';
+
+// You can use print statements as follows for debugging, they'll be visible when running tests.
+console.log("Logs from your program will appear here!");
+
+// Uncomment this block to pass the first stage
+// const rl = createInterface({
+//   input: process.stdin,
+//   output: process.stdout
+// });
+//
+// rl.question('$ ', (answer) => {
+//   rl.close();
+// });
diff --git a/compiled_starters/typescript/bun.lockb b/compiled_starters/typescript/bun.lockb
diff --git a/compiled_starters/typescript/codecrafters.yml b/compiled_starters/typescript/codecrafters.yml
@@ -0,0 +1,11 @@
+# Set this to true if you want debug logs.
+#
+# These can be VERY verbose, so we suggest turning them off
+# unless you really need them.
+debug: false
+
+# Use this to change the TypeScript version used to run your code
+# on Codecrafters.
+#
+# Available versions: bun-1.1
+language_pack: bun-1.1
diff --git a/compiled_starters/typescript/package.json b/compiled_starters/typescript/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@codecrafters/build-your-own-shell",
+  "description": "Build your own Shell challenge, from Codecrafters",
+  "type": "module",
+  "scripts": {
+    "dev": "bun run app/main.ts"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.2"
+  }
+}
diff --git a/compiled_starters/typescript/tsconfig.json b/compiled_starters/typescript/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "ts-node": {
+    "esm": true
+  }
+}
diff --git a/compiled_starters/typescript/your_shell.sh b/compiled_starters/typescript/your_shell.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# DON'T EDIT THIS!
+#
+# CodeCrafters uses this file to test your code. Don't make any changes here!
+#
+# DON'T EDIT THIS!
+exec bun run app/main.ts "$@"
diff --git a/course-definition.yml b/course-definition.yml
@@ -23,6 +23,7 @@ languages:
   - slug: "javascript"
   - slug: "c"
   - slug: "cpp"
+  - slug: "typescript"
 
 marketing:
   difficulty: medium
diff --git a/dockerfiles/bun-1.1.Dockerfile b/dockerfiles/bun-1.1.Dockerfile
@@ -0,0 +1,17 @@
+FROM oven/bun:1.1.4-alpine
+
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="package.json,bun.lockb"
+
+WORKDIR /app
+
+COPY package.json ./
+COPY bun.lockb ./
+
+# For reproducible builds.
+# This will install the exact versions of each package specified in the lockfile.
+# If package.json disagrees with bun.lockb, Bun will exit with an error. The lockfile will not be updated.
+RUN bun install --frozen-lockfile
+
+RUN mkdir -p /app-cached
+# If the node_modules directory exists, move it to /app-cached
+RUN if [ -d "/app/node_modules" ]; then mv /app/node_modules /app-cached; fi
diff --git a/solutions/typescript/01-oo8/code/.gitattributes b/solutions/typescript/01-oo8/code/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/solutions/typescript/01-oo8/code/.gitignore b/solutions/typescript/01-oo8/code/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/solutions/typescript/01-oo8/code/README.md b/solutions/typescript/01-oo8/code/README.md
@@ -0,0 +1,35 @@
+![progress-banner](https://codecrafters.io/landing/images/default_progress_banners/shell.png)
+
+This is a starting point for TypeScript solutions to the
+["Build Your Own Shell" Challenge](https://app.codecrafters.io/courses/shell/overview).
+
+In this challenge, you'll build your own POSIX compliant shell that's capable of
+interpreting shell commands, running external programs and builtin commands like
+cd, pwd, echo and more. Along the way, you'll learn about shell command parsing,
+REPLs, builtin commands, and more.
+
+**Note**: If you're viewing this repo on GitHub, head over to
+[codecrafters.io](https://codecrafters.io) to try the challenge.
+
+# Passing the first stage
+
+The entry point for your `shell` implementation is in `app/main.ts`. Study and
+uncomment the relevant code, and push your changes to pass the first stage:
+
+```sh
+git add .
+git commit -m "pass 1st stage" # any msg
+git push origin master
+```
+
+Time to move on to the next stage!
+
+# Stage 2 & beyond
+
+Note: This section is for stages 2 and beyond.
+
+1. Ensure you have `bun (1.1)` installed locally
+1. Run `./your_shell.sh` to run your program, which is implemented in
+   `app/main.ts`.
+1. Commit your changes and run `git push origin master` to submit your solution
+   to CodeCrafters. Test output will be streamed to your terminal.
diff --git a/solutions/typescript/01-oo8/code/app/main.ts b/solutions/typescript/01-oo8/code/app/main.ts
@@ -0,0 +1,10 @@
+import { createInterface } from 'readline';
+
+const rl = createInterface({
+  input: process.stdin,
+  output: process.stdout
+});
+
+rl.question('$ ', (answer) => {
+  rl.close();
+});
diff --git a/solutions/typescript/01-oo8/code/bun.lockb b/solutions/typescript/01-oo8/code/bun.lockb
diff --git a/solutions/typescript/01-oo8/code/codecrafters.yml b/solutions/typescript/01-oo8/code/codecrafters.yml
@@ -0,0 +1,11 @@
+# Set this to true if you want debug logs.
+#
+# These can be VERY verbose, so we suggest turning them off
+# unless you really need them.
+debug: false
+
+# Use this to change the TypeScript version used to run your code
+# on Codecrafters.
+#
+# Available versions: bun-1.1
+language_pack: bun-1.1
diff --git a/solutions/typescript/01-oo8/code/package.json b/solutions/typescript/01-oo8/code/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@codecrafters/build-your-own-shell",
+  "description": "Build your own Shell challenge, from Codecrafters",
+  "type": "module",
+  "scripts": {
+    "dev": "bun run app/main.ts"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.2"
+  }
+}
diff --git a/solutions/typescript/01-oo8/code/tsconfig.json b/solutions/typescript/01-oo8/code/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "ts-node": {
+    "esm": true
+  }
+}
diff --git a/solutions/typescript/01-oo8/code/your_shell.sh b/solutions/typescript/01-oo8/code/your_shell.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# DON'T EDIT THIS!
+#
+# CodeCrafters uses this file to test your code. Don't make any changes here!
+#
+# DON'T EDIT THIS!
+exec bun run app/main.ts "$@"
diff --git a/solutions/typescript/01-oo8/diff/app/main.ts.diff b/solutions/typescript/01-oo8/diff/app/main.ts.diff
@@ -0,0 +1,24 @@
+@@ -1,15 +1,10 @@
+-// Uncomment this block to pass the first stage
+-// import { createInterface } from 'readline';
++import { createInterface } from 'readline';
+
+-// You can use print statements as follows for debugging, they'll be visible when running tests.
+-console.log("Logs from your program will appear here!");
++const rl = createInterface({
++  input: process.stdin,
++  output: process.stdout
++});
+
+-// Uncomment this block to pass the first stage
+-// const rl = createInterface({
+-//   input: process.stdin,
+-//   output: process.stdout
+-// });
+-//
+-// rl.question('$ ', (answer) => {
+-//   rl.close();
+-// });
++rl.question('$ ', (answer) => {
++  rl.close();
++});
diff --git a/solutions/typescript/01-oo8/explanation.md b/solutions/typescript/01-oo8/explanation.md
@@ -0,0 +1,28 @@
+The entry point for your Shell implementation is in `app/main.ts`.
+
+Study and uncomment the relevant code: 
+
+```typescript
+// Uncomment this block to pass the first stage
+import { createInterface } from 'readline';
+```
+
+```typescript
+// Uncomment this block to pass the first stage
+const rl = createInterface({
+  input: process.stdin,
+  output: process.stdout
+});
+
+rl.question('$ ', (answer) => {
+  rl.close();
+});
+```
+
+Push your changes to pass the first stage:
+
+```
+git add .
+git commit -m "pass 1st stage" # any msg
+git push origin master
+```
diff --git a/starter-repository-definitions.yml b/starter-repository-definitions.yml
@@ -145,3 +145,27 @@
   template_attributes:
     required_executable: "java (21)"
     user_editable_file: "src/main/java/Main.java"
+
+- language: typescript
+  file_mappings:
+    - source: starter_templates/README.md
+      target: README.md
+    - source: starter_templates/codecrafters.yml
+      target: codecrafters.yml
+    - source: starter_templates/typescript/app/main.ts
+      target: app/main.ts
+    - source: starter_templates/typescript/package.json
+      target: package.json
+    - source: starter_templates/typescript/bun.lockb
+      target: bun.lockb
+    - source: starter_templates/typescript/tsconfig.json
+      target: tsconfig.json
+    - source: starter_templates/typescript/your_shell.sh
+      target: your_shell.sh
+    - source: starter_templates/.gitattributes
+      target: .gitattributes
+    - source: starter_templates/typescript/.gitignore
+      target: .gitignore
+  template_attributes:
+    required_executable: "bun (1.1)"
+    user_editable_file: "app/main.ts"
diff --git a/starter_templates/codecrafters.yml b/starter_templates/codecrafters.yml
@@ -34,4 +34,8 @@ language_pack: nodejs-21
 {{# language_is_cpp }}
 # Available versions: cpp-23
 language_pack: cpp-23
-{{/ language_is_cpp }}
+{{/ language_is_cpp }}
+{{# language_is_typescript}}
+# Available versions: bun-1.1
+language_pack: bun-1.1
+{{/ language_is_typescript}}
diff --git a/starter_templates/typescript/.gitignore b/starter_templates/typescript/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/starter_templates/typescript/README.md b/starter_templates/typescript/README.md
@@ -0,0 +1,15 @@
+# @codecrafters/build-your-own-shell
+
+To install dependencies:
+
+```bash
+bun install
+```
+
+To run:
+
+```bash
+bun run app/main.ts
+```
+
+This project was created using `bun init` in bun v1.1.8. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.
diff --git a/starter_templates/typescript/app/main.ts b/starter_templates/typescript/app/main.ts
@@ -0,0 +1,15 @@
+// Uncomment this block to pass the first stage
+// import { createInterface } from 'readline';
+
+// You can use print statements as follows for debugging, they'll be visible when running tests.
+console.log("Logs from your program will appear here!");
+
+// Uncomment this block to pass the first stage
+// const rl = createInterface({
+//   input: process.stdin,
+//   output: process.stdout
+// });
+//
+// rl.question('$ ', (answer) => {
+//   rl.close();
+// });
diff --git a/starter_templates/typescript/bun.lockb b/starter_templates/typescript/bun.lockb
diff --git a/starter_templates/typescript/package.json b/starter_templates/typescript/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@codecrafters/build-your-own-shell",
+  "description": "Build your own Shell challenge, from Codecrafters",
+  "type": "module",
+  "scripts": {
+    "dev": "bun run app/main.ts"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.2"
+  }
+}
diff --git a/starter_templates/typescript/tsconfig.json b/starter_templates/typescript/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "ts-node": {
+    "esm": true
+  }
+}
diff --git a/starter_templates/typescript/your_shell.sh b/starter_templates/typescript/your_shell.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# DON'T EDIT THIS!
+#
+# CodeCrafters uses this file to test your code. Don't make any changes here!
+#
+# DON'T EDIT THIS!
+exec bun run app/main.ts "$@"
