@scaffscript/core 0.2.5 → 0.2.6

package/dist/index.cjs

@@ -344,14 +344,14 @@ function getTabLevels(str, tabType) {
 // package.json
 var package_default = {
   name: "@scaffscript/core",
-  version: "0.2.3",
+  version: "0.2.6",
   repository: {
     type: "git",
     url: "https://github.com/undervolta/scaffscript"
   },
   main: "dist/index.cjs",
   devDependencies: {
-    "@types/bun": "latest"
+    "@types/bun": "^1.3.11"
   },
   peerDependencies: {
     typescript: "^5"
@@ -722,15 +722,21 @@ async function implementModules(module2, fileGroup, file, config, mods) {
           for (const [idx, [_, include]] of modIterator) {
             if (idx > 0)
               switch (include.value.type) {
-                case "object":
-                case "method":
-                case "array":
+                case "function":
+                case "class":
+                case "type":
+                case "interface":
                 case "enum":
                   toReplace += `
 `;
                   break;
               }
-            toReplace += include.value.parsedStr + `
+            if (include.value.type === "class")
+              toReplace += `${include.value.declaration} {
+${include.value.body}
+}`;
+            else
+              toReplace += include.value.parsedStr + `
 `;
             if (idx === modLen - 1)
               toReplace += `
@@ -773,7 +779,10 @@ async function implementModules(module2, fileGroup, file, config, mods) {
             case "content":
               const tabChar = config.tabType === "1t" ? "\t" : config.tabType === "2s" ? "  " : "    ";
               const tabCnt = countTabsBeforeSubstring(file.content, match[0], tabChar);
-              parsedStr = module2[mod.targetPath][`@${contentMod}` in module2[mod.targetPath] ? `@${contentMod}` : contentMod].parsedStr;
+              const usedMod = module2[mod.targetPath][`@${contentMod}` in module2[mod.targetPath] ? `@${contentMod}` : contentMod];
+              parsedStr = usedMod?.type !== "class" ? usedMod?.parsedStr ?? "" : `${usedMod?.declaration} {
+${usedMod?.body}
+}`;
               if (tabCnt > 0) {
                 const tabLevels = getTabLevels(parsedStr, config.tabType).map((l) => l + tabCnt);
                 file.content = file.content.replace(match[0], parsedStr.split(`
@@ -984,6 +993,7 @@ function countBraces(line) {
   return count;
 }
 function parseFnParams(str) {
+  fnParamsRegex.lastIndex = 0;
   const match = str.match(fnParamsRegex);
   let names = [];
   let defaults = [];
@@ -1004,9 +1014,10 @@ function parseFnParams(str) {
   return { names, defaults, combined };
 }
 function convertClassMethods(classBody) {
+  const reservedMethodNames = new Set(["if", "for", "while", "switch", "catch", "do", "else", "try", "finally"]);
   const methodRegex = /(\w+)\s*\(([^)]*)\)\s*{([\s\S]*?)}/g;
   return classBody.replace(methodRegex, (match, methodName, params, body) => {
-    if (methodName === "function")
+    if (methodName === "function" || reservedMethodNames.has(methodName))
       return match;
     return `${methodName} = function(${params.replaceAll("?", " = undefined")}) {${body}}`;
   });
@@ -1065,7 +1076,14 @@ function getExportedModules(files, config) {
           const body = funcCode.slice(funcCode.indexOf("{")).trim();
           const params = parseFnParams(funcCode);
           const parsedStr = `function ${name}(${params.combined.join(", ")}) ${body}`;
-          module2[filePath][name] = { name, value: body.slice(1, -1), type: "function", parsedStr };
+          module2[filePath][name] = {
+            name,
+            value: body.slice(1, -1),
+            type: "function",
+            parsedStr,
+            header: funcCode.slice(0, funcCode.indexOf("{")).trim(),
+            blockValue: insertTabs(1, config.tabType) + body.slice(1, -1)
+          };
         }
       } else if (line.startsWith("export class ")) {
         const classLines = [];
@@ -1101,7 +1119,14 @@ function getExportedModules(files, config) {
           const parsedStr = `function ${name}(${constructor.replaceAll("?", " = undefined")}) constructor {
 ${insertTabs(1, config.tabType)}${classBody}
 }`;
-          module2[filePath][name] = { name, value: classCode.replace("export ", ""), type: "class", parsedStr };
+          module2[filePath][name] = {
+            name,
+            value: classCode.replace("export ", ""),
+            type: "class",
+            parsedStr,
+            declaration: `function ${name}(${constructor.replaceAll("?", " = undefined")}) constructor`,
+            body: `${insertTabs(1, config.tabType)}${classBody}`
+          };
         }
       } else if (line.startsWith("export interface ")) {
         const interfaceLines = [];
@@ -1204,14 +1229,28 @@ ${insertTabs(1, config.tabType)}${classBody}
               const parsedStr = `${name} = function(${params.combined.join(", ")}) ${arrowBlock}`;
               if (!module2[filePath])
                 module2[filePath] = {};
-              module2[filePath][name] = { name, value: arrowBlock.slice(1, -1), type: "arrow-fn", parsedStr };
+              module2[filePath][name] = {
+                name,
+                value: arrowBlock.slice(1, -1),
+                type: "function",
+                header: `${name} = function(${params.combined.join(", ")})`,
+                blockValue: arrowBlock,
+                parsedStr
+              };
             } else {
               const params = parseFnParams(valuePart);
               const body = valuePart.split("=>")[1].trim();
               const parsedStr = `${name} = function(${params.combined.join(", ")}) { return ${body}; }`;
               if (!module2[filePath])
                 module2[filePath] = {};
-              module2[filePath][name] = { name, value: body, type: "arrow-fn", parsedStr };
+              module2[filePath][name] = {
+                name,
+                value: body,
+                type: "function",
+                header: `${name} = function(${params.combined.join(", ")})`,
+                blockValue: body,
+                parsedStr
+              };
             }
           } else if (valuePart.startsWith("function")) {
             if (valuePart.trim().endsWith("{")) {
@@ -1233,12 +1272,27 @@ ${insertTabs(1, config.tabType)}${classBody}
               const parsedStr = `${name} = function(${params.combined.join(", ")}) ${funcBlock}`;
               if (!module2[filePath])
                 module2[filePath] = {};
-              module2[filePath][name] = { name, value: funcBlock.slice(1, -1), type: "method", parsedStr };
+              module2[filePath][name] = {
+                name,
+                value: funcBlock.slice(1, -1),
+                type: "function",
+                header: `${name} = function(${params.combined.join(", ")})`,
+                blockValue: funcBlock,
+                parsedStr
+              };
             } else {
+              const params = parseFnParams(valuePart);
               const parsedStr = `${name} = ${valuePart}`;
               if (!module2[filePath])
                 module2[filePath] = {};
-              module2[filePath][name] = { name, value: line.replace("export ", ""), type: "method", parsedStr };
+              module2[filePath][name] = {
+                name,
+                value: line.replace("export ", ""),
+                type: "function",
+                header: `${name} = function(${params.combined.join(", ")})`,
+                blockValue: valuePart,
+                parsedStr
+              };
             }
           } else {
             let varType = "var";
@@ -1248,7 +1302,6 @@ ${insertTabs(1, config.tabType)}${classBody}
               varType = "let";
             else if (decl?.includes("var"))
               varType = "var";
-            const noVarKeyword = varType === "var" && !parts[0].includes("var");
             if (!module2[filePath])
               module2[filePath] = {};
             const parsedStr = varType !== "const" ? `${varType === "let" ? "" : "var "}${name} = ${valuePart};` : `#macro ${name} ${valuePart}`;
@@ -1374,7 +1427,15 @@ function reexportModule(module2, file, config) {
   return true;
 }
 // src/parser/class-implement.ts
+function resolveOptionalParams(str) {
+  const funcExprRegex = /(\w+)\s*=\s*function\s*\(([^)]*)\)/g;
+  return str.replace(funcExprRegex, (match, name, params) => {
+    const resolvedParams = params.replace(/\?/g, " = undefined");
+    return `${name} = function(${resolvedParams})`;
+  });
+}
 function convertArrowFn(str) {
+  arrowFnHeaderRegex.lastIndex = 0;
   return str.replace(arrowFnHeaderRegex, (match, _p1, _p2, _offset, _input, groups) => {
     if (!groups?.name)
       return match;
@@ -1396,6 +1457,12 @@ function parseHeader(str, regex = implHeaderRegex) {
     let i = start;
     for (;i < str.length; i++) {
       const char = str[i];
+      if (!inString && char === "/" && str[i + 1] === "/") {
+        while (i < str.length && str[i] !== `
+`)
+          i++;
+        continue;
+      }
       if (inString) {
         if (char === stringChar && (i === 0 || str[i - 1] !== "\\")) {
           inString = false;
@@ -1437,9 +1504,10 @@ function implementClass(module2, fileGroup, config) {
     const filePath = fileImpl.parent.isIndex ? fileImpl.parent.path : `${fileImpl.parent.path}/${fileImpl.parent.name}`;
     const match = parseHeader(fileImpl.file.content);
     const classNames = [];
-    for (const [mIdx, m] of match.entries()) {
+    for (const [_, m] of match.entries()) {
       const { name: className } = m;
       let { body } = m;
+      body = resolveOptionalParams(body);
       body = convertClassMethods(body);
       body = convertArrowFn(body);
       if (!className || !body)
@@ -1470,31 +1538,31 @@ function implementClass(module2, fileGroup, config) {
             continue;
           }
         }
-        const classCloseBracket = module2[newFilePath][className].parsedStr.lastIndexOf("}");
-        module2[newFilePath][className].parsedStr = module2[newFilePath][className].parsedStr.slice(0, classCloseBracket) + `${body.replace(`
-`, "")}` + (mIdx < match.length - 1 ? `
-
-` : `
-}
-`);
-        if (mIdx === match.length - 1) {
-          for (const name of classNames) {
-            if (!module2[filePath] || !module2[filePath][name])
-              continue;
-            module2[filePath][name].parsedStr += `}
-`;
+        if (module2[newFilePath][className].type === "class") {
+          const newMod = module2[newFilePath][className];
+          newMod.body += `
+${body}`;
+        } else {
+          if (config.onNotFound === "error") {
+            log.error(`Class \x1B[33m${className}\x1B[0m not found for file \x1B[34m${fileImpl.file.name}\x1B[0m. Aborting...`);
+            return false;
+          } else {
+            log.warn(`Class \x1B[33m${className}\x1B[0m not found for file \x1B[34m${fileImpl.file.name}\x1B[0m. Skipping this class...`);
+            continue;
           }
-        } else
-          classNames.splice(classNames.indexOf(className), 1);
+        }
         continue;
+      } else if (module2[filePath][className].type === "class") {
+        module2[filePath][className].body += `
+${body}`;
       } else {
-        const classCloseBracket = module2[filePath][className].parsedStr.lastIndexOf("}");
-        module2[filePath][className].parsedStr = module2[filePath][className].parsedStr.slice(0, classCloseBracket) + `${body.replace(`
-`, "")}` + (mIdx < match.length - 1 ? `
-
-` : `
-}
-`);
+        if (config.onNotFound === "error") {
+          log.error(`Class \x1B[33m${className}\x1B[0m not found for file \x1B[34m${fileImpl.file.name}\x1B[0m. Aborting...`);
+          return false;
+        } else {
+          log.warn(`Class \x1B[33m${className}\x1B[0m not found for file \x1B[34m${fileImpl.file.name}\x1B[0m. Skipping this class...`);
+          continue;
+        }
       }
     }
   }

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "@scaffscript/core",
-  "version": "0.2.5",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/undervolta/scaffscript"
-  },
-  "main": "dist/index.cjs",
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
-  "peerDependencies": {
-    "typescript": "^5"
-  },
-  "bin": {
-    "scaff": "./dist/index.cjs"
-  },
-  "description": "A minimal superset language of GML with TypeScript-like module system",
-  "files": [
-    "dist"
-  ],
-  "keywords": [
-    "gamemaker",
-    "gml",
-    "scaff",
-    "script",
-    "superset",
-    "module",
-    "cli"
-  ],
-  "license": "MIT",
-  "scripts": {
-    "build": "bun run build:all",
-    "build:node": "bun build src/index-node.ts --outfile dist/index.cjs --target node --format cjs",
-    "build:bun": "bun build src/index-bun.ts --outfile build/index.mjs --target bun --format esm",
-    "build:all": "bun run build:node && bun run build:bun",
-    "dev": "bun run src/index-node.ts",
-    "prelink": "bun run build"
-  },
-  "type": "module"
-}
+{
+  "name": "@scaffscript/core",
+  "version": "0.2.6",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/undervolta/scaffscript"
+  },
+  "main": "dist/index.cjs",
+  "devDependencies": {
+    "@types/bun": "^1.3.11"
+  },
+  "peerDependencies": {
+    "typescript": "^5"
+  },
+  "bin": {
+    "scaff": "./dist/index.cjs"
+  },
+  "description": "A minimal superset language of GML with TypeScript-like module system",
+  "files": [
+    "dist"
+  ],
+  "keywords": [
+    "gamemaker",
+    "gml",
+    "scaff",
+    "script",
+    "superset",
+    "module",
+    "cli"
+  ],
+  "license": "MIT",
+  "scripts": {
+    "build": "bun run build:all",
+    "build:node": "bun build src/index-node.ts --outfile dist/index.cjs --target node --format cjs",
+    "build:bun": "bun build src/index-bun.ts --outfile build/index.mjs --target bun --format esm",
+    "build:all": "bun run build:node && bun run build:bun",
+    "dev": "bun run src/index-node.ts",
+    "prelink": "bun run build"
+  },
+  "type": "module"
+}