add import attribute loaders for extension handlers

suchipi · suchipi · commit b3ca4db70156 · 2026-05-14T23:16:59.000-06:00
diff --git a/meta/tests/fixtures/import-attributes/extensionless/civet b/meta/tests/fixtures/import-attributes/extensionless/civet
@@ -0,0 +1,6 @@
+console.log 2 + 2
+
+const something = (a: string) ->
+  a
+
+export default something("yeah")
diff --git a/meta/tests/fixtures/import-attributes/extensionless/coffee b/meta/tests/fixtures/import-attributes/extensionless/coffee
@@ -0,0 +1,6 @@
+console.log 2 + 2
+
+something = (a) ->
+  a
+
+export default something("yeah")
diff --git a/meta/tests/fixtures/import-attributes/extensionless/js b/meta/tests/fixtures/import-attributes/extensionless/js
@@ -0,0 +1,2 @@
+console.log(2 + 2);
+export default "yeah";
diff --git a/meta/tests/fixtures/import-attributes/extensionless/json b/meta/tests/fixtures/import-attributes/extensionless/json
@@ -0,0 +1 @@
+{"json": "yup"}
diff --git a/meta/tests/fixtures/import-attributes/extensionless/json5 b/meta/tests/fixtures/import-attributes/extensionless/json5
@@ -0,0 +1,2 @@
+// comment
+{json5: "yup"}
diff --git a/meta/tests/fixtures/import-attributes/extensionless/jsx b/meta/tests/fixtures/import-attributes/extensionless/jsx
@@ -0,0 +1 @@
+console.log(<a />);
diff --git a/meta/tests/fixtures/import-attributes/extensionless/toml b/meta/tests/fixtures/import-attributes/extensionless/toml
@@ -0,0 +1,23 @@
+# This is a TOML document
+
+title = "TOML Example"
+
+[owner]
+name = "Tom Preston-Werner"
+dob = 1979-05-27T07:32:00-08:00
+
+[database]
+enabled = true
+ports = [ 8000, 8001, 8002 ]
+data = [ ["delta", "phi"], [3.14] ]
+temp_targets = { cpu = 79.5, case = 72.0 }
+
+[servers]
+
+[servers.alpha]
+ip = "10.0.0.1"
+role = "frontend"
+
+[servers.beta]
+ip = "10.0.0.2"
+role = "backend"
diff --git a/meta/tests/fixtures/import-attributes/extensionless/ts b/meta/tests/fixtures/import-attributes/extensionless/ts
@@ -0,0 +1,6 @@
+function something(a: string) {
+  console.log(a);
+  return a;
+}
+
+export default "yeah";
diff --git a/meta/tests/fixtures/import-attributes/extensionless/tsx b/meta/tests/fixtures/import-attributes/extensionless/tsx
@@ -0,0 +1,7 @@
+something(<a />);
+
+function something(a: JSX.Element) {
+  console.log(a);
+}
+
+export default <link />;
diff --git a/meta/tests/fixtures/import-attributes/extensionless/yml b/meta/tests/fixtures/import-attributes/extensionless/yml
@@ -0,0 +1,23 @@
+version: 2.1
+
+# Define the jobs we want to run for this project
+jobs:
+  build:
+    docker:
+      - image: cimg/base:2023.03
+    steps:
+      - checkout
+      - run: echo "this is the build job"
+  test:
+    docker:
+      - image: cimg/base:2023.03
+    steps:
+      - checkout
+      - run: echo "this is the test job"
+
+# Orchestrate our job run sequence
+workflows:
+  build_and_test:
+    jobs:
+      - build
+      - test
diff --git a/meta/tests/fixtures/import-attributes/load-civet.js b/meta/tests/fixtures/import-attributes/load-civet.js
@@ -0,0 +1,2 @@
+import civet from "./extensionless/civet" with { type: "civet" };
+console.log(civet);
diff --git a/meta/tests/fixtures/import-attributes/load-coffee.js b/meta/tests/fixtures/import-attributes/load-coffee.js
@@ -0,0 +1,2 @@
+import coffee from "./extensionless/coffee" with { type: "coffeescript" };
+console.log(coffee);
diff --git a/meta/tests/fixtures/import-attributes/load-js.js b/meta/tests/fixtures/import-attributes/load-js.js
@@ -0,0 +1,2 @@
+import js from "./extensionless/js" with { type: "javascript" };
+console.log(js);
diff --git a/meta/tests/fixtures/import-attributes/load-json.js b/meta/tests/fixtures/import-attributes/load-json.js
@@ -0,0 +1,2 @@
+import json from "./extensionless/json" with { type: "json" };
+console.log(json);
diff --git a/meta/tests/fixtures/import-attributes/load-json5.js b/meta/tests/fixtures/import-attributes/load-json5.js
@@ -0,0 +1,2 @@
+import json5 from "./extensionless/json5" with { type: "json5" };
+console.log(json5);
diff --git a/meta/tests/fixtures/import-attributes/load-jsx.js b/meta/tests/fixtures/import-attributes/load-jsx.js
@@ -0,0 +1,2 @@
+import jsx from "./extensionless/jsx" with { type: "jsx" };
+console.log(jsx);
diff --git a/meta/tests/fixtures/import-attributes/load-toml.js b/meta/tests/fixtures/import-attributes/load-toml.js
@@ -0,0 +1,2 @@
+import toml from "./extensionless/toml" with { type: "toml" };
+console.log(toml);
diff --git a/meta/tests/fixtures/import-attributes/load-ts.js b/meta/tests/fixtures/import-attributes/load-ts.js
@@ -0,0 +1,2 @@
+import ts from "./extensionless/ts" with { type: "typescript" };
+console.log(ts);
diff --git a/meta/tests/fixtures/import-attributes/load-tsx.js b/meta/tests/fixtures/import-attributes/load-tsx.js
@@ -0,0 +1,2 @@
+import tsx from "./extensionless/tsx" with { type: "tsx" };
+console.log(tsx);
diff --git a/meta/tests/fixtures/import-attributes/load-yaml.js b/meta/tests/fixtures/import-attributes/load-yaml.js
@@ -0,0 +1,2 @@
+import yml from "./extensionless/yml" with { type: "yaml" };
+console.log(yml);
diff --git a/meta/tests/fixtures/import-attributes/load-yml.js b/meta/tests/fixtures/import-attributes/load-yml.js
@@ -0,0 +1,2 @@
+import yml from "./extensionless/yml" with { type: "yml" };
+console.log(yml);
diff --git a/meta/tests/src/import-attributes.test.ts b/meta/tests/src/import-attributes.test.ts
@@ -0,0 +1,264 @@
+import { runYavascript, rootDir } from "./test-helpers";
+
+const fixturesDir = rootDir.concat("meta/tests/fixtures/import-attributes");
+
+test("civet", async () => {
+  const result = await runYavascript([fixturesDir("load-civet.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "4
+   yeah
+   ",
+   }
+  `);
+});
+
+test("coffee", async () => {
+  const result = await runYavascript([fixturesDir("load-coffee.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "4
+   yeah
+   ",
+   }
+  `);
+});
+
+test("js", async () => {
+  const result = await runYavascript([fixturesDir("load-js.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "4
+   yeah
+   ",
+   }
+  `);
+});
+
+test("json", async () => {
+  const result = await runYavascript([fixturesDir("load-json.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "{
+     json: "yup"
+   }
+   ",
+   }
+  `);
+});
+
+test("json5", async () => {
+  const result = await runYavascript([fixturesDir("load-json5.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "{
+     json5: "yup"
+   }
+   ",
+   }
+  `);
+});
+
+test("toml", async () => {
+  const result = await runYavascript([fixturesDir("load-toml.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "{
+     title: "TOML Example"
+     owner: {
+       name: "Tom Preston-Werner"
+       dob: "1979-05-27T15:32:00.000Z"
+     }
+     database: {
+       enabled: true
+       ports: [
+         8000
+         8001
+         8002
+       ]
+       data: [
+         [
+           "delta"
+           "phi"
+         ]
+         [
+           3.14
+         ]
+       ]
+       temp_targets: {
+         cpu: 79.5
+         case: 72
+       }
+     }
+     servers: {
+       alpha: {
+         ip: "10.0.0.1"
+         role: "frontend"
+       }
+       beta: {
+         ip: "10.0.0.2"
+         role: "backend"
+       }
+     }
+   }
+   ",
+   }
+  `);
+});
+
+test("ts", async () => {
+  const result = await runYavascript([fixturesDir("load-ts.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "yeah
+   ",
+   }
+  `);
+});
+
+test("tsx", async () => {
+  const result = await runYavascript([fixturesDir("load-tsx.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "{
+     $$typeof: Symbol(JSX.Element)
+     type: "a"
+     props: null
+     key: null
+   }
+   {
+     $$typeof: Symbol(JSX.Element)
+     type: "link"
+     props: null
+     key: null
+   }
+   ",
+   }
+  `);
+});
+
+test("yml", async () => {
+  const result = await runYavascript([fixturesDir("load-yml.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "{
+     version: 2.1
+     jobs: {
+       build: {
+         docker: [
+           {
+             image: "cimg/base:2023.03"
+           }
+         ]
+         steps: [
+           "checkout"
+           {
+             run: "echo "this is the build job""
+           }
+         ]
+       }
+       test: {
+         docker: [
+           {
+             image: "cimg/base:2023.03"
+           }
+         ]
+         steps: [
+           "checkout"
+           {
+             run: "echo "this is the test job""
+           }
+         ]
+       }
+     }
+     workflows: {
+       build_and_test: {
+         jobs: [
+           "build"
+           "test"
+         ]
+       }
+     }
+   }
+   ",
+   }
+  `);
+});
+
+test("yaml", async () => {
+  const result = await runYavascript([fixturesDir("load-yaml.js")]);
+  expect(result).toMatchInlineSnapshot(`
+   {
+     "code": 0,
+     "error": null,
+     "stderr": "",
+     "stdout": "{
+     version: 2.1
+     jobs: {
+       build: {
+         docker: [
+           {
+             image: "cimg/base:2023.03"
+           }
+         ]
+         steps: [
+           "checkout"
+           {
+             run: "echo "this is the build job""
+           }
+         ]
+       }
+       test: {
+         docker: [
+           {
+             image: "cimg/base:2023.03"
+           }
+         ]
+         steps: [
+           "checkout"
+           {
+             run: "echo "this is the test job""
+           }
+         ]
+       }
+     }
+     workflows: {
+       build_and_test: {
+         jobs: [
+           "build"
+           "test"
+         ]
+       }
+     }
+   }
+   ",
+   }
+  `);
+});
diff --git a/src/extension-handlers/civet.ts b/src/extension-handlers/civet.ts
@@ -5,3 +5,5 @@ ModuleDelegate.compilers[".civet"] = (filename: string, content: string) => {
   const compiled = compilers.civet(content, { filename });
   return compiled;
 };
+// import attribute version
+ModuleDelegate.compilers["civet"] = ModuleDelegate.compilers[".civet"];
diff --git a/src/extension-handlers/coffee.ts b/src/extension-handlers/coffee.ts
diff --git a/src/extension-handlers/js.ts b/src/extension-handlers/js.ts
diff --git a/src/extension-handlers/json.ts b/src/extension-handlers/json.ts
diff --git a/src/extension-handlers/jsx.ts b/src/extension-handlers/jsx.ts
diff --git a/src/extension-handlers/toml.ts b/src/extension-handlers/toml.ts
diff --git a/src/extension-handlers/ts.ts b/src/extension-handlers/ts.ts
diff --git a/src/extension-handlers/tsx.ts b/src/extension-handlers/tsx.ts
diff --git a/src/extension-handlers/yaml.ts b/src/extension-handlers/yaml.ts
diff --git a/src/module-hooks.ts b/src/module-hooks.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+console.log(2 + 2);`
	`2`	`+export default "yeah";`