@awsless/awsless 0.0.174 → 0.0.176

package/dist/bin.js

@@ -1062,8 +1062,8 @@ var Cancelled = class extends Error {
 // src/config/load/read.ts
 var readConfig = async (file) => {
   try {
-    const json3 = await readFile(file, "utf8");
-    const data = JSON5.parse(json3);
+    const json4 = await readFile(file, "utf8");
+    const data = JSON5.parse(json4);
     return data;
   } catch (error) {
     if (error instanceof Error) {
@@ -2479,7 +2479,7 @@ import { paramCase as paramCase5 } from "change-case";
 import { mergeTypeDefs } from "@graphql-tools/merge";
 import { generate } from "@awsless/graphql";
 import { buildSchema, print } from "graphql";
-import { readFile as readFile4 } from "fs/promises";
+import { readFile as readFile5 } from "fs/promises";
 import { Asset as Asset2, Node as Node6, aws as aws6 } from "@awsless/formation";
 
 // src/feature/domain/util.ts
@@ -2500,6 +2500,134 @@ var formatFullDomainName = (config2, id, subDomain) => {
   return domain;
 };
 
+// src/build/fingerprint.ts
+import { createHash as createHash3 } from "crypto";
+import { readFile as readFile4, readdir as readdir2, stat as stat4 } from "fs/promises";
+import { basename as basename4, dirname as dirname6, extname as extname3, join as join7 } from "path";
+import parseStaticImports2 from "parse-static-imports";
+var extensions2 = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
+var generateFileHashes2 = async (file, hashes) => {
+  if (hashes.has(file)) {
+    return;
+  }
+  const code = await readModuleFile2(file);
+  const deps = await findDependencies2(file, code);
+  const hash = createHash3("sha1").update(code).digest();
+  hashes.set(file, hash);
+  for (const dep of deps) {
+    if (dep.startsWith("/")) {
+      await generateFileHashes2(dep, hashes);
+    }
+  }
+};
+var fingerprintFromFile2 = async (file) => {
+  const hashes = /* @__PURE__ */ new Map();
+  await generateFileHashes2(file, hashes);
+  const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
+  return createHash3("sha1").update(merge2).digest("hex");
+};
+var fingerprintFromDirectory = async (dir) => {
+  const hashes = /* @__PURE__ */ new Map();
+  const files = await readdir2(dir, { recursive: true });
+  for (const file of files) {
+    if (extensions2.includes(extname3(file).substring(1))) {
+      await generateFileHashes2(join7(dir, file), hashes);
+    }
+  }
+  const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
+  return createHash3("sha1").update(merge2).digest("hex");
+};
+var readModuleFile2 = (file) => {
+  if (file.endsWith(".js")) {
+    return readFiles2([file, file.substring(0, file.length - 3) + ".ts"]);
+  }
+  if (!basename4(file).includes(".")) {
+    return readFiles2([
+      file,
+      ...extensions2.map((exp) => `${file}.${exp}`),
+      ...extensions2.map((exp) => join7(file, `/index.${exp}`))
+    ]);
+  }
+  return readFile4(file, "utf8");
+};
+var readFiles2 = async (files) => {
+  for (const file of files) {
+    try {
+      const s = await stat4(file);
+      if (s.isFile()) {
+        return readFile4(file, "utf8");
+      }
+    } catch (_) {
+      continue;
+    }
+  }
+  throw new Error(`No such file: ${files.join(", ")}`);
+};
+var findDependencies2 = async (file, code) => {
+  const imports = await parseStaticImports2(code);
+  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join7(dirname6(file), value) : value);
+};
+
+// src/feature/graphql/build/typescript/resolver.ts
+import { rollup as rollup2 } from "rollup";
+import { swc as swc2, minify as swcMinify2 } from "rollup-plugin-swc3";
+import json2 from "@rollup/plugin-json";
+import commonjs2 from "@rollup/plugin-commonjs";
+import nodeResolve2 from "@rollup/plugin-node-resolve";
+import { dirname as dirname7 } from "path";
+var buildTypeScriptResolver = async (input, { minify = true } = {}) => {
+  const bundle = await rollup2({
+    input,
+    external: (importee) => {
+      return importee.startsWith("@aws-sdk") || importee.startsWith("aws-sdk") || importee.startsWith("@aws-appsync/utils");
+    },
+    onwarn: (error) => {
+      debugError(error.message);
+    },
+    treeshake: {
+      moduleSideEffects: (id) => input === id
+    },
+    plugins: [
+      // @ts-ignore
+      commonjs2({ sourceMap: true }),
+      // @ts-ignore
+      nodeResolve2({ preferBuiltins: true }),
+      swc2({
+        // minify,
+        // module: true,
+        jsc: {
+          baseUrl: dirname7(input),
+          minify: { sourceMap: true }
+        },
+        sourceMaps: true
+      }),
+      minify ? swcMinify2({
+        module: true,
+        sourceMap: true,
+        compress: true
+      }) : void 0,
+      // @ts-ignore
+      json2()
+    ]
+  });
+  const result = await bundle.generate({
+    format: "esm",
+    sourcemap: "hidden",
+    exports: "auto",
+    manualChunks: {},
+    entryFileNames: `index.mjs`,
+    chunkFileNames: `[name].mjs`
+  });
+  let code;
+  for (const item of result.output) {
+    if (item.type !== "chunk") {
+      continue;
+    }
+    code = item.code;
+  }
+  return Buffer.from(code, "utf8");
+};
+
 // src/feature/graphql/index.ts
 var defaultResolver = `
 export function request(ctx) {
@@ -2545,7 +2673,7 @@ var graphqlFeature = defineFeature({
     for (const [id, files] of apis) {
       const sources = await Promise.all(
         files.map((file) => {
-          return readFile4(file, "utf8");
+          return readFile5(file, "utf8");
         })
       );
       if (sources.length) {
@@ -2609,8 +2737,24 @@ var graphqlFeature = defineFeature({
           }
         }
       });
-      ctx.base.export(`graphql-${id}-id`, api.id);
       group.add(api);
+      ctx.base.export(`graphql-${id}-id`, api.id);
+      if (props.resolver) {
+        ctx.registerBuild("graphql-resolver", id, async (build3) => {
+          const resolver = props.resolver;
+          const version = await fingerprintFromFile2(resolver);
+          return build3(version, async (write) => {
+            const file = await buildTypeScriptResolver(resolver);
+            if (!file) {
+              throw new FileError(resolver, `Failed to build a graphql resolver.`);
+            }
+            await write("resolver.js", file);
+            return {
+              size: formatByteSize(file.byteLength)
+            };
+          });
+        });
+      }
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
         const domainGroup = new Node6("domain", domainName);
@@ -2707,9 +2851,8 @@ var graphqlFeature = defineFeature({
           let code = Asset2.fromString(defaultResolver);
           if ("resolver" in props2 && props2.resolver) {
             code = Asset2.fromFile(props2.resolver);
-          }
-          if (defaultProps.resolver) {
-            code = Asset2.fromString(defaultProps.resolver);
+          } else if (defaultProps.resolver) {
+            code = Asset2.fromFile(getBuildPath("graphql-resolver", id, "resolver.js"));
           }
           const config2 = new aws6.appsync.FunctionConfiguration("config", {
             apiId: api.id,
@@ -3292,9 +3435,9 @@ import { camelCase as camelCase5 } from "change-case";
 import { relative as relative3 } from "path";
 
 // src/util/id.ts
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 var shortId = (ns) => {
-  return createHash3("md5").update(ns).digest("hex").substring(0, 10);
+  return createHash4("md5").update(ns).digest("hex").substring(0, 10);
 };
 
 // src/feature/http/index.ts
@@ -3528,11 +3671,11 @@ var searchFeature = defineFeature({
 import { Asset as Asset3, Node as Node17, aws as aws17 } from "@awsless/formation";
 import { days as days3, seconds as seconds3 } from "@awsless/duration";
 import { glob as glob2 } from "glob";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/feature/site/util.ts
 import { lookup, contentType } from "mime-types";
-import { extname as extname3 } from "path";
+import { extname as extname4 } from "path";
 var getCacheControl = (file) => {
   switch (lookup(file)) {
     case false:
@@ -3547,7 +3690,7 @@ var getCacheControl = (file) => {
   }
 };
 var getContentType = (file) => {
-  return contentType(extname3(file)) || "text/html; charset=utf-8";
+  return contentType(extname4(file)) || "text/html; charset=utf-8";
 };
 
 // src/feature/site/index.ts
@@ -3622,7 +3765,7 @@ var siteFeature = defineFeature({
           const object = new aws17.s3.BucketObject(file, {
             bucket: bucket.name,
             key: file,
-            body: Asset3.fromFile(join7(props.static, file)),
+            body: Asset3.fromFile(join8(props.static, file)),
             cacheControl: getCacheControl(file),
             contentType: getContentType(file)
           });
@@ -4097,68 +4240,6 @@ import { run } from "promise-dag";
 import { join as join9 } from "path";
 import { mkdir as mkdir2, readFile as readFile6, writeFile as writeFile2 } from "fs/promises";
 
-// src/build/fingerprint.ts
-import { createHash as createHash4 } from "crypto";
-import { readFile as readFile5, readdir as readdir2, stat as stat4 } from "fs/promises";
-import { basename as basename4, dirname as dirname6, extname as extname4, join as join8 } from "path";
-import parseStaticImports2 from "parse-static-imports";
-var extensions2 = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
-var generateFileHashes2 = async (file, hashes) => {
-  if (hashes.has(file)) {
-    return;
-  }
-  const code = await readModuleFile2(file);
-  const deps = await findDependencies2(file, code);
-  const hash = createHash4("sha1").update(code).digest();
-  hashes.set(file, hash);
-  for (const dep of deps) {
-    if (dep.startsWith("/")) {
-      await generateFileHashes2(dep, hashes);
-    }
-  }
-};
-var fingerprintFromDirectory = async (dir) => {
-  const hashes = /* @__PURE__ */ new Map();
-  const files = await readdir2(dir, { recursive: true });
-  for (const file of files) {
-    if (extensions2.includes(extname4(file).substring(1))) {
-      await generateFileHashes2(join8(dir, file), hashes);
-    }
-  }
-  const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
-  return createHash4("sha1").update(merge2).digest("hex");
-};
-var readModuleFile2 = (file) => {
-  if (file.endsWith(".js")) {
-    return readFiles2([file, file.substring(0, file.length - 3) + ".ts"]);
-  }
-  if (!basename4(file).includes(".")) {
-    return readFiles2([
-      file,
-      ...extensions2.map((exp) => `${file}.${exp}`),
-      ...extensions2.map((exp) => join8(file, `/index.${exp}`))
-    ]);
-  }
-  return readFile5(file, "utf8");
-};
-var readFiles2 = async (files) => {
-  for (const file of files) {
-    try {
-      const s = await stat4(file);
-      if (s.isFile()) {
-        return readFile5(file, "utf8");
-      }
-    } catch (_) {
-      continue;
-    }
-  }
-  throw new Error(`No such file: ${files.join(", ")}`);
-};
-var findDependencies2 = async (file, code) => {
-  const imports = await parseStaticImports2(code);
-  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join8(dirname6(file), value) : value);
-};
-
 // src/test/reporter.ts
 import { getSuites, getTests } from "@vitest/runner/utils";
 var CustomReporter = class {
@@ -4239,12 +4320,12 @@ var CustomReporter = class {
 };
 
 // src/test/start.ts
-import { swc as swc2 } from "rollup-plugin-swc3";
+import { swc as swc3 } from "rollup-plugin-swc3";
 import { configDefaults } from "vitest/config";
 import { startVitest } from "vitest/node";
-import commonjs2 from "@rollup/plugin-commonjs";
-import nodeResolve2 from "@rollup/plugin-node-resolve";
-import json2 from "@rollup/plugin-json";
+import commonjs3 from "@rollup/plugin-commonjs";
+import nodeResolve3 from "@rollup/plugin-node-resolve";
+import json3 from "@rollup/plugin-json";
 var startTest = async (props) => {
   const result = await startVitest(
     "test",
@@ -4266,10 +4347,10 @@ var startTest = async (props) => {
     {
       plugins: [
         // @ts-ignore
-        commonjs2({ sourceMap: true }),
+        commonjs3({ sourceMap: true }),
         // @ts-ignore
-        nodeResolve2({ preferBuiltins: true }),
-        swc2({
+        nodeResolve3({ preferBuiltins: true }),
+        swc3({
           jsc: {
             // baseUrl: dirname(input),
             minify: { sourceMap: true }
@@ -4277,7 +4358,7 @@ var startTest = async (props) => {
           sourceMaps: true
         }),
         // @ts-ignore
-        json2()
+        json3()
       ]
     }
   );
@@ -4549,7 +4630,7 @@ import { log as log8 } from "@clack/prompts";
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir3, writeFile as writeFile3 } from "fs/promises";
-import { dirname as dirname7, join as join10, relative as relative4 } from "path";
+import { dirname as dirname8, join as join10, relative as relative4 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -4563,7 +4644,7 @@ var generateTypes = async (props) => {
             if (include) {
               files.push(relative4(directories.root, path));
             }
-            await mkdir3(dirname7(path), { recursive: true });
+            await mkdir3(dirname8(path), { recursive: true });
             await writeFile3(path, code);
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.174",
+  "version": "0.0.176",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,9 +29,9 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.18",
+    "@awsless/sns": "^0.0.7",
     "@awsless/redis": "^0.0.12",
     "@awsless/s3": "^0.0.10",
-    "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1",
@@ -97,10 +97,10 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
-    "@awsless/formation": "^0.0.5",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/size": "^0.0.1",
+    "@awsless/formation": "^0.0.5",
     "@awsless/validate": "^0.0.13",
-    "@awsless/graphql": "^0.0.9",
     "@awsless/code": "^0.0.10"
   },
   "scripts": {