@lark-apaas/db-schema-sync 0.1.0-alpha.1 → 0.1.0-alpha.2

package/dist/bin.js

@@ -6,7 +6,7 @@ import {
   __toESM,
   generateSchema,
   resolveEnvOptions
-} from "./chunk-QO7QQCAM.js";
+} from "./chunk-NQ3MLSYQ.js";
 
 // node_modules/dotenv/package.json
 var require_package = __commonJS({

package/dist/{chunk-QO7QQCAM.js → chunk-NQ3MLSYQ.js}

@@ -1037,10 +1037,7 @@ function sanitizeIdentifier(name) {
   return sanitized;
 }
 function sanitizePropertyName(name) {
-  const leadingUnderscore = name.startsWith("_") ? "_" : "";
-  const stripped = leadingUnderscore ? name.slice(1) : name;
-  const base = sanitizeIdentifier(stripped);
-  return `${leadingUnderscore}${base}`;
+  return sanitizeIdentifier(name);
 }
 function getUniqueIdentifier(name, usedIdentifiers) {
   const base = sanitizeIdentifier(name);
@@ -1077,6 +1074,7 @@ function normalizeField(field, systemFieldNamesToRemove) {
 }
 function normalizeRelationship(rel) {
   return {
+    constraintName: rel.constraintName || void 0,
     fieldNames: rel.fieldName,
     targetTableName: rel.fkTableName,
     targetFieldNames: rel.fkFieldName,
@@ -1251,10 +1249,17 @@ var primitiveMappers = [
     generate: (f) => `text("${escapeDoubleQuote(f.fieldName)}")`,
     imports: () => [{ name: "text", from: PG_CORE }]
   },
-  // integer (int2, int4, integer)
+  // smallint (int2)
+  {
+    name: "smallint",
+    match: (f) => f.type === "int2",
+    generate: (f) => `smallint("${escapeDoubleQuote(f.fieldName)}")`,
+    imports: () => [{ name: "smallint", from: PG_CORE }]
+  },
+  // integer (int4, integer)
   {
     name: "integer",
-    match: (f) => ["int2", "int4", "integer"].includes(f.type),
+    match: (f) => ["int4", "integer"].includes(f.type),
     generate: (f) => `integer("${escapeDoubleQuote(f.fieldName)}")`,
     imports: () => [{ name: "integer", from: PG_CORE }]
   },
@@ -1307,6 +1312,13 @@ var primitiveMappers = [
     generate: (f) => `jsonb("${escapeDoubleQuote(f.fieldName)}")`,
     imports: () => [{ name: "jsonb", from: PG_CORE }]
   },
+  // timestamp (without timezone) — uses drizzle-orm timestamp, not customTimestamptz
+  {
+    name: "timestamp",
+    match: (f) => f.type === "timestamp",
+    generate: (f) => `timestamp("${escapeDoubleQuote(f.fieldName)}", { mode: 'string' })`,
+    imports: () => [{ name: "timestamp", from: PG_CORE }]
+  },
   // date
   {
     name: "date",
@@ -1314,6 +1326,13 @@ var primitiveMappers = [
     generate: (f) => `date("${escapeDoubleQuote(f.fieldName)}")`,
     imports: () => [{ name: "date", from: PG_CORE }]
   },
+  // timetz (time with time zone)
+  {
+    name: "timetz",
+    match: (f) => f.type === "timetz",
+    generate: (f) => `time("${escapeDoubleQuote(f.fieldName)}", { withTimezone: true })`,
+    imports: () => [{ name: "time", from: PG_CORE }]
+  },
   // time
   {
     name: "time",
@@ -1331,7 +1350,7 @@ var primitiveMappers = [
 ];
 
 // src/generator/mappers/custom-types.ts
-var TIMESTAMP_TYPES = ["timestamptz", "timestamp"];
+var TIMESTAMP_TYPES = ["timestamptz"];
 var CUSTOM_TYPE_MAP = {
   user_profile: "userProfile",
   file_attachment: "fileAttachment"
@@ -1385,6 +1404,17 @@ var customTypeMappers = [
   }
 ];
 
+// src/generator/mappers/enum-mapper.ts
+function createEnumMapper(enumNameToIdentifier) {
+  return {
+    name: "enum",
+    match: (f) => f.isEnum && enumNameToIdentifier.has(f.type),
+    generate: (f) => `${enumNameToIdentifier.get(f.type)}("${escapeDoubleQuote(f.fieldName)}")`,
+    imports: () => []
+    // pgEnum import is added at the structural level
+  };
+}
+
 // src/generator/mappers/fallback.ts
 var fallbackMapper = {
   name: "fallback-text",
@@ -1394,8 +1424,11 @@ var fallbackMapper = {
 };
 
 // src/generator/mappers/index.ts
-function createDefaultRegistry() {
+function createDefaultRegistry(enumNameToIdentifier) {
   const registry = new TypeMapperRegistry();
+  if (enumNameToIdentifier && enumNameToIdentifier.size > 0) {
+    registry.register(createEnumMapper(enumNameToIdentifier));
+  }
   for (const mapper of customTypeMappers) registry.register(mapper);
   for (const mapper of primitiveMappers) registry.register(mapper);
   registry.register(fallbackMapper);
@@ -1503,9 +1536,11 @@ function generateForeignKeyCode(rel, tableIdentifier, tableIdentifierMap) {
   const columns = rel.fieldNames.map((f) => `table.${sanitizePropertyName(f)}`).join(", ");
   const targetIdentifier = tableIdentifierMap?.get(rel.targetTableName) ?? sanitizeIdentifier(rel.targetTableName);
   const foreignColumns = rel.targetFieldNames.map((f) => `${targetIdentifier}.${sanitizePropertyName(f)}`).join(", ");
+  const namePart = rel.constraintName ? `
+    name: "${escapeDoubleQuote(rel.constraintName)}",` : "";
   let code = `foreignKey({
     columns: [${columns}],
-    foreignColumns: [${foreignColumns}],
+    foreignColumns: [${foreignColumns}],${namePart}
   })`;
   if (rel.removePolicy && rel.removePolicy !== "NO_ACTION") {
     code += `.onDelete("${escapeDoubleQuote(rel.removePolicy.toLowerCase())}")`;
@@ -1564,7 +1599,11 @@ ${fieldLines.join("\n")}
 
 // src/generator/index.ts
 function generateSchemaCode(data) {
-  const registry = createDefaultRegistry();
+  const enumNameToIdentifier = /* @__PURE__ */ new Map();
+  for (const enumSchema of data.enums) {
+    enumNameToIdentifier.set(enumSchema.enumName, enumSchema.identifier);
+  }
+  const registry = createDefaultRegistry(enumNameToIdentifier);
   const collector = new ImportCollector();
   if (data.enums.length > 0) {
     collector.add({ name: "pgEnum", from: "drizzle-orm/pg-core" });
@@ -1791,7 +1830,8 @@ var TYPE_RULES = [
   {
     usageName: "customTimestamptz",
     definitionCheck: "const customTimestamptz = customType<",
-    definition: CUSTOM_TIMESTAMPTZ_DEFINITION
+    definition: CUSTOM_TIMESTAMPTZ_DEFINITION,
+    alwaysExport: true
   },
   {
     usageName: "userProfile",
@@ -1853,7 +1893,7 @@ var inlineTypesEnhancer = {
     for (const rule of TYPE_RULES) {
       if (usedTypes.has(rule.usageName) && !text.includes(rule.definitionCheck)) {
         let def = rule.definition;
-        if (exportCustomTypes) {
+        if (rule.alwaysExport || exportCustomTypes) {
           def = def.replace(/^(const |function |type )/gm, "export $1");
         }
         definitions.push(def);

package/dist/index.d.ts

@@ -28,6 +28,7 @@ interface FieldSchema {
     extraInfo?: Record<string, unknown>;
 }
 interface RelationshipSchema {
+    constraintName?: string;
     fieldNames: string[];
     targetTableName: string;
     targetFieldNames: string[];
@@ -73,6 +74,7 @@ interface ApiFieldItem {
     [key: string]: unknown;
 }
 interface ApiRelationshipItem {
+    constraintName?: string;
     fieldName: string[];
     fkTableName: string;
     fkFieldName: string[];

package/dist/index.js

@@ -5,7 +5,7 @@ import {
   generateSchemaFromData,
   normalizeApiResponse,
   resolveEnvOptions
-} from "./chunk-QO7QQCAM.js";
+} from "./chunk-NQ3MLSYQ.js";
 export {
   generateSchema,
   generateSchemaCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/db-schema-sync",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",