@xubylele/schema-forge 1.5.1 → 1.5.2

package/dist/cli.js

@@ -45,6 +45,7 @@ function parseSchema(source) {
     "timestamptz",
     "date"
   ]);
+  const validIdentifierPattern = /^[A-Za-z_][A-Za-z0-9_]*$/;
   function normalizeColumnType3(type) {
     return type.toLowerCase().trim().replace(/\s+/g, " ").replace(/\s*\(\s*/g, "(").replace(/\s*,\s*/g, ",").replace(/\s*\)\s*/g, ")");
   }
@@ -53,12 +54,103 @@ function parseSchema(source) {
     if (validBaseColumnTypes.has(normalizedType)) {
       return true;
     }
-    return /^varchar\(\d+\)$/.test(normalizedType) || /^numeric\(\d+,\d+\)$/.test(normalizedType);
+    const varcharMatch = normalizedType.match(/^varchar\((\d+)\)$/);
+    if (varcharMatch) {
+      const length = Number(varcharMatch[1]);
+      return Number.isInteger(length) && length > 0;
+    }
+    const numericMatch = normalizedType.match(/^numeric\((\d+),(\d+)\)$/);
+    if (numericMatch) {
+      const precision = Number(numericMatch[1]);
+      const scale = Number(numericMatch[2]);
+      return Number.isInteger(precision) && Number.isInteger(scale) && precision > 0 && scale >= 0 && scale <= precision;
+    }
+    return false;
+  }
+  function validateIdentifier(identifier, lineNum, context) {
+    if (!validIdentifierPattern.test(identifier)) {
+      throw new Error(`Line ${lineNum}: Invalid ${context} name '${identifier}'. Use letters, numbers, and underscores, and do not start with a number.`);
+    }
+  }
+  function validateDefaultValue(value, lineNum) {
+    let parenBalance = 0;
+    let inSingleQuote = false;
+    let inDoubleQuote = false;
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+      if (char === "'" && !inDoubleQuote) {
+        if (inSingleQuote && value[index + 1] === "'") {
+          index++;
+          continue;
+        }
+        inSingleQuote = !inSingleQuote;
+        continue;
+      }
+      if (char === '"' && !inSingleQuote) {
+        if (inDoubleQuote && value[index + 1] === '"') {
+          index++;
+          continue;
+        }
+        inDoubleQuote = !inDoubleQuote;
+        continue;
+      }
+      if (inSingleQuote || inDoubleQuote) {
+        continue;
+      }
+      if (char === "(") {
+        parenBalance++;
+        continue;
+      }
+      if (char === ")") {
+        parenBalance--;
+        if (parenBalance < 0) {
+          throw new Error(`Line ${lineNum}: Invalid default value '${value}'. Unmatched parentheses in function call.`);
+        }
+      }
+    }
+    if (inSingleQuote || inDoubleQuote) {
+      throw new Error(`Line ${lineNum}: Invalid default value '${value}'. Unterminated quoted string.`);
+    }
+    if (parenBalance > 0) {
+      if (parenBalance === 1) {
+        throw new Error(`Line ${lineNum}: Invalid default value '${value}'. Function call is missing closing parenthesis.`);
+      }
+      throw new Error(`Line ${lineNum}: Invalid default value '${value}'. Unmatched parentheses in function call.`);
+    }
   }
   function cleanLine(line) {
-    const commentIndex = line.search(/(?:\/\/|#)/);
-    if (commentIndex !== -1) {
-      line = line.substring(0, commentIndex);
+    let inSingleQuote = false;
+    let inDoubleQuote = false;
+    for (let index = 0; index < line.length; index++) {
+      const char = line[index];
+      const nextChar = line[index + 1];
+      if (char === "'" && !inDoubleQuote) {
+        if (inSingleQuote && nextChar === "'") {
+          index++;
+          continue;
+        }
+        inSingleQuote = !inSingleQuote;
+        continue;
+      }
+      if (char === '"' && !inSingleQuote) {
+        if (inDoubleQuote && nextChar === '"') {
+          index++;
+          continue;
+        }
+        inDoubleQuote = !inDoubleQuote;
+        continue;
+      }
+      if (inSingleQuote || inDoubleQuote) {
+        continue;
+      }
+      if (char === "#") {
+        line = line.substring(0, index);
+        break;
+      }
+      if (char === "/" && nextChar === "/") {
+        line = line.substring(0, index);
+        break;
+      }
     }
     return line.trim();
   }
@@ -67,6 +159,8 @@ function parseSchema(source) {
     if (parts.length !== 2 || !parts[0] || !parts[1]) {
       throw new Error(`Line ${lineNum}: Invalid foreign key format '${fkRef}'. Expected format: table.column`);
     }
+    validateIdentifier(parts[0], lineNum, "foreign key table");
+    validateIdentifier(parts[1], lineNum, "foreign key column");
     return {
       table: parts[0],
       column: parts[1]
@@ -75,11 +169,13 @@ function parseSchema(source) {
   function parseColumn(line, lineNum) {
     const tokens = line.split(/\s+/).filter((t) => t.length > 0);
     const modifiers = /* @__PURE__ */ new Set(["pk", "unique", "nullable", "default", "fk"]);
+    const appliedModifiers = /* @__PURE__ */ new Set();
     if (tokens.length < 2) {
       throw new Error(`Line ${lineNum}: Invalid column definition. Expected: <name> <type> [modifiers...]`);
     }
     const colName = tokens[0];
     const colType = normalizeColumnType3(tokens[1]);
+    validateIdentifier(colName, lineNum, "column");
     if (!isValidColumnType2(colType)) {
       throw new Error(`Line ${lineNum}: Invalid column type '${tokens[1]}'. Valid types: ${Array.from(validBaseColumnTypes).join(", ")}, varchar(n), numeric(p,s)`);
     }
@@ -91,16 +187,28 @@ function parseSchema(source) {
     let i = 2;
     while (i < tokens.length) {
       const modifier = tokens[i];
+      const markModifierApplied = (name) => {
+        if (appliedModifiers.has(name)) {
+          throw new Error(`Line ${lineNum}: Duplicate modifier '${name}'`);
+        }
+        appliedModifiers.add(name);
+      };
       switch (modifier) {
         case "pk":
+          markModifierApplied("pk");
           column.primaryKey = true;
           i++;
           break;
         case "unique":
+          markModifierApplied("unique");
           column.unique = true;
           i++;
           break;
         case "nullable":
+          if (appliedModifiers.has("not null")) {
+            throw new Error(`Line ${lineNum}: Cannot combine 'nullable' with 'not null'`);
+          }
+          markModifierApplied("nullable");
           column.nullable = true;
           i++;
           break;
@@ -108,27 +216,35 @@ function parseSchema(source) {
           if (tokens[i + 1] !== "null") {
             throw new Error(`Line ${lineNum}: Unknown modifier 'not'`);
           }
+          if (appliedModifiers.has("nullable")) {
+            throw new Error(`Line ${lineNum}: Cannot combine 'not null' with 'nullable'`);
+          }
+          markModifierApplied("not null");
           column.nullable = false;
           i += 2;
           break;
         case "default":
+          markModifierApplied("default");
           i++;
           if (i >= tokens.length) {
             throw new Error(`Line ${lineNum}: 'default' modifier requires a value`);
           }
           {
             const defaultTokens = [];
-            while (i < tokens.length && !modifiers.has(tokens[i])) {
+            while (i < tokens.length && !modifiers.has(tokens[i]) && !(tokens[i] === "not" && tokens[i + 1] === "null")) {
               defaultTokens.push(tokens[i]);
               i++;
             }
             if (defaultTokens.length === 0) {
               throw new Error(`Line ${lineNum}: 'default' modifier requires a value`);
             }
-            column.default = defaultTokens.join(" ");
+            const defaultValue = defaultTokens.join(" ");
+            validateDefaultValue(defaultValue, lineNum);
+            column.default = defaultValue;
           }
           break;
         case "fk":
+          markModifierApplied("fk");
           i++;
           if (i >= tokens.length) {
             throw new Error(`Line ${lineNum}: 'fk' modifier requires a table.column reference`);
@@ -144,11 +260,12 @@ function parseSchema(source) {
   }
   function parseTableBlock(startLine) {
     const firstLine = cleanLine(lines[startLine]);
-    const match = firstLine.match(/^table\s+(\w+)\s*\{?\s*$/);
+    const match = firstLine.match(/^table\s+(\w+)\s*\{\s*$/);
     if (!match) {
       throw new Error(`Line ${startLine + 1}: Invalid table definition. Expected: table <name> {`);
     }
     const tableName = match[1];
+    validateIdentifier(tableName, startLine + 1, "table");
     if (tables[tableName]) {
       throw new Error(`Line ${startLine + 1}: Duplicate table definition '${tableName}'`);
     }
@@ -2050,7 +2167,7 @@ var import_commander6 = require("commander");
 // package.json
 var package_default = {
   name: "@xubylele/schema-forge",
-  version: "1.5.1",
+  version: "1.5.2",
   description: "Universal migration generator from schema DSL",
   main: "dist/cli.js",
   type: "commonjs",
@@ -2097,7 +2214,7 @@ var package_default = {
   devDependencies: {
     "@changesets/cli": "^2.29.8",
     "@types/node": "^25.2.3",
-    "@xubylele/schema-forge-core": "^1.0.5",
+    "@xubylele/schema-forge-core": "^1.1.0",
     "ts-node": "^10.9.2",
     tsup: "^8.5.1",
     typescript: "^5.9.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xubylele/schema-forge",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Universal migration generator from schema DSL",
   "main": "dist/cli.js",
   "type": "commonjs",
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
     "@types/node": "^25.2.3",
-    "@xubylele/schema-forge-core": "^1.0.5",
+    "@xubylele/schema-forge-core": "^1.1.0",
     "ts-node": "^10.9.2",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",