lecodes-cli 2.0.10 → 2.0.12

package/dist/index.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "lecodes-cli",
-    version: "2.0.10",
+    version: "2.0.12",
     dependencies: {
       "@letary/chisel": "^0.13.0",
       jimp: "^1.6.1",
@@ -76,7 +76,7 @@ var init_package = __esm(() => {
     },
     peerDependencies: {
       "lecodes-design": "^0.11.0",
-      "lecodes-headless": "^2.0.10",
+      "lecodes-headless": "^2.0.12",
       "lecodes-3d-editor": "^0.9.0",
       "lecodes-assets": "^0.2.1",
       "heic-decode": "^2.1.0",
@@ -146,7 +146,7 @@ var init_package = __esm(() => {
 });
 
 // ../../sdk/src/version.ts
-var SDK_VERSION = "2.0.10", sdkMajor = (version) => {
+var SDK_VERSION = "2.0.12", sdkMajor = (version) => {
   const m = version?.match(/^(\d+)\.\d+\.\d+/);
   return m ? Number(m[1]) : null;
 }, bundleSdkVersion = (head) => head.slice(0, 2000).match(/^\/\/ sdk: (\d+\.\d+\.\d+\S*)/m)?.[1] ?? null, bundleRunsOn = (bundleVersion, hostVersion) => sdkMajor(bundleVersion) !== null && sdkMajor(bundleVersion) === sdkMajor(hostVersion);
@@ -169992,7 +169992,7 @@ var normalizePath2 = (path) => {
       parts.push(part);
   }
   return "/" + parts.join("/");
-}, EndpointTypeError, SyncEndpointError, WrongSideGlobalError, injectNames = (ts, source) => {
+}, EndpointTypeError, ServerHelperImportError, WrongSideGlobalError, injectNames = (ts, source) => {
   const out = new Set;
   const sf = ts.createSourceFile("inject.ts", source, ts.ScriptTarget.ESNext, false);
   for (const st of sf.statements) {
@@ -170034,7 +170034,40 @@ var normalizePath2 = (path) => {
     visit(sf);
   }
   return out;
-}, FILE_TYPE_PATH = "/__lecodes/file.d.ts", deriveEndpointParams = async (entries, modules, typescript) => {
+}, FILE_TYPE_PATH = "/__lecodes/file.d.ts", helperImports = (ts, program, checker, modules, projectFiles) => {
+  const kinds = new Map(Object.entries(modules).map(([path, exports]) => [normalizePath2(path), new Map(exports.map((e) => [e.name, e.kind]))]));
+  const out = [];
+  for (const sf of program.getSourceFiles()) {
+    if (!projectFiles.has(sf.fileName) || sf.isDeclarationFile || isServerPath(sf.fileName))
+      continue;
+    const file = serverModuleId(sf.fileName);
+    for (const statement of sf.statements) {
+      if (!ts.isImportDeclaration(statement) || !statement.importClause?.namedBindings || !ts.isNamedImports(statement.importClause.namedBindings))
+        continue;
+      if (statement.importClause.isTypeOnly)
+        continue;
+      for (const spec of statement.importClause.namedBindings.elements) {
+        if (spec.isTypeOnly)
+          continue;
+        let symbol = checker.getSymbolAtLocation(spec.name);
+        if (symbol && symbol.flags & ts.SymbolFlags.Alias)
+          symbol = checker.getAliasedSymbol(symbol);
+        const decl = symbol?.valueDeclaration ?? symbol?.declarations?.[0];
+        if (!symbol || !decl)
+          continue;
+        const target = normalizePath2(decl.getSourceFile().fileName);
+        const name = (spec.propertyName ?? spec.name).text;
+        if (kinds.get(target)?.get(name) !== "other")
+          continue;
+        if (checker.getTypeOfSymbolAtLocation(symbol, decl).getCallSignatures().length === 0)
+          continue;
+        const { line } = sf.getLineAndCharacterOfPosition(spec.getStart(sf));
+        out.push(`${file}:${line + 1}: ${name} of ${serverModuleId(target)}`);
+      }
+    }
+  }
+  return out;
+}, deriveEndpointParams = async (entries, modules, typescript) => {
   let ts;
   if (typescript)
     ts = typescript;
@@ -170091,8 +170124,6 @@ var normalizePath2 = (path) => {
   const params = {};
   const warnings = [];
   const problems = [];
-  const sync2 = [];
-  const awaitable = (type) => !!(type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) || (type.flags & ts.TypeFlags.Union ? type.types.every(awaitable) : !!type.getProperty("then"));
   for (const [path, exports] of Object.entries(modules)) {
     const sf = program.getSourceFile(normalizePath2(path));
     if (!sf) {
@@ -170137,10 +170168,6 @@ var normalizePath2 = (path) => {
         warnings.push(`${where}: not callable — unvalidated`);
         continue;
       }
-      if (ex.kind === "fn" && !awaitable(checker.getReturnTypeOfSignature(sig))) {
-        const { line } = sf.getLineAndCharacterOfPosition(decl.getStart(sf));
-        sync2.push(`${serverModuleId(path)}:${line + 1}: ${ex.name} — write \`async\` before it`);
-      }
       const list = [];
       for (const p of sig.getParameters()) {
         const pd = p.valueDeclaration;
@@ -170164,11 +170191,12 @@ var normalizePath2 = (path) => {
   }
   if (problems.length)
     throw new EndpointTypeError(problems);
-  if (sync2.length)
-    throw new SyncEndpointError(sync2);
   const wrongSide = wrongSideGlobals(ts, program, checker, new Set(files.keys()));
   if (wrongSide.length)
     throw new WrongSideGlobalError(wrongSide);
+  const helpers = helperImports(ts, program, checker, modules, new Set(files.keys()));
+  if (helpers.length)
+    throw new ServerHelperImportError(helpers);
   const unawaited = [];
   for (const path of Object.keys(modules)) {
     const sf = program.getSourceFile(normalizePath2(path));
@@ -170341,13 +170369,13 @@ var init_serverTypes = __esm(() => {
       this.problems = problems;
     }
   };
-  SyncEndpointError = class SyncEndpointError extends Error {
+  ServerHelperImportError = class ServerHelperImportError extends Error {
     problems;
     constructor(problems) {
-      super(`an endpoint is called over the network, so in the app its result is a promise — declare it async:
+      super(`a function of a server file that is not async is a helper of the server, for server files only — the app calls endpoints, which are \`export async function\`:
   ${problems.join(`
   `)}`);
-      this.name = "SyncEndpointError";
+      this.name = "ServerHelperImportError";
       this.problems = problems;
     }
   };
@@ -170428,24 +170456,10 @@ var SERVER_FILE, isServerPath = (path) => SERVER_FILE.test(path), serverModuleId
   const s = init.trimStart();
   if (/^channel\s*[<(]/.test(s))
     return "channel";
-  if (/^(async\s+)?function\b/.test(s))
+  if (/^async\s+function\b/.test(s))
     return "fn";
   if (/^async\b/.test(s))
     return "fn";
-  if (new RegExp(`^${IDENT}\\s*=>`).test(s))
-    return "fn";
-  if (/^\(/.test(s)) {
-    let depth = 0;
-    for (let i = 0;i < s.length; i++) {
-      if (s[i] === "(")
-        depth++;
-      else if (s[i] === ")") {
-        depth--;
-        if (depth === 0)
-          return /^\s*(:[^=]*)?=>/.test(s.slice(i + 1)) ? "fn" : "other";
-      }
-    }
-  }
   return "other";
 }, scanServerExports = (source, path = "<server module>") => {
   const src = blankCommentsAndStrings(source);
@@ -170461,7 +170475,7 @@ var SERVER_FILE, isServerPath = (path) => SERVER_FILE.test(path), serverModuleId
       found.push({ at, name, kind });
   };
   for (const m of src.matchAll(new RegExp(`(^|\\n)\\s*export\\s+(async\\s+)?function\\s*\\*?\\s*(${IDENT})`, "g")))
-    add(m.index, m[3], "fn");
+    add(m.index, m[3], m[2] ? "fn" : "other");
   for (const m of src.matchAll(new RegExp(`(^|\\n)\\s*export\\s+(?:const|let|var)\\s+(${IDENT})\\s*(?::[^=]*?)?=\\s*([^\\n]*)`, "g"))) {
     add(m.index, m[2], classifyInit(m[3]));
   }
@@ -170474,7 +170488,7 @@ var SERVER_FILE, isServerPath = (path) => SERVER_FILE.test(path), serverModuleId
         continue;
       const name = exported ?? local;
       let kind = "other";
-      if (new RegExp(`(^|\\n)\\s*(async\\s+)?function\\s*\\*?\\s*${local}\\b`).test(src))
+      if (new RegExp(`(^|\\n)\\s*async\\s+function\\s*\\*?\\s*${local}\\b`).test(src))
         kind = "fn";
       else {
         const decl = src.match(new RegExp(`(^|\\n)\\s*(?:const|let|var)\\s+${local}\\s*(?::[^=]*?)?=\\s*([^\\n]*)`));
@@ -172209,7 +172223,7 @@ __export(exports_compile, {
   WrongSideGlobalError: () => WrongSideGlobalError,
   UnawaitedUserQueryError: () => UnawaitedUserQueryError,
   TARGET_MATRIX_GENERATION: () => TARGET_MATRIX_GENERATION,
-  SyncEndpointError: () => SyncEndpointError,
+  ServerHelperImportError: () => ServerHelperImportError,
   SERVER_INJECT: () => SERVER_INJECT,
   SERVER_ENTRY_PATH: () => SERVER_ENTRY_PATH,
   SDK_VERSION: () => SDK_VERSION,

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "lecodes-cli",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "dependencies": {
     "@letary/chisel": "^0.13.0",
     "jimp": "^1.6.1",
-    "lecodes-sdk": "2.0.10"
+    "lecodes-sdk": "2.0.12"
   },
   "devDependencies": {
     "lecodes-design": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-design/lecodes-design-0.11.0.tgz",
-    "lecodes-headless": "2.0.10",
+    "lecodes-headless": "2.0.12",
     "qrcode-terminal": "^0.12.0",
     "lecodes-3d-editor": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-3d-editor/lecodes-3d-editor-0.9.0.tgz",
     "lecodes-assets": "0.2.1",
     "lecodes-creator-nav": "0.19.0",
-    "lecodes-gl-lite": "2.0.10",
-    "lecodes-web-frame": "2.0.10",
-    "lecodes-web-player": "2.0.10",
-    "lecodes-web-shared": "2.0.10",
+    "lecodes-gl-lite": "2.0.12",
+    "lecodes-web-frame": "2.0.12",
+    "lecodes-web-player": "2.0.12",
+    "lecodes-web-shared": "2.0.12",
     "lecodes-web-lite": "2.0.2",
     "heic-decode": "^2.1.0",
     "marcidb-embedded": "^0.14.1",
@@ -24,7 +24,7 @@
   },
   "peerDependencies": {
     "lecodes-design": "^0.11.0",
-    "lecodes-headless": "^2.0.10",
+    "lecodes-headless": "^2.0.12",
     "lecodes-3d-editor": "^0.9.0",
     "lecodes-assets": "^0.2.1",
     "heic-decode": "^2.1.0",