@lark-apaas/db-schema-sync 0.1.6-alpha.2 → 0.1.6-alpha.3

package/dist/bin.js

@@ -6,7 +6,7 @@ import {
   __toESM,
   generateSchema,
   resolveEnvOptions
-} from "./chunk-TQCGDNFC.js";
+} from "./chunk-HRE26HBV.js";
 
 // node_modules/dotenv/package.json
 var require_package = __commonJS({
@@ -424,12 +424,10 @@ function parseArgs(argv) {
 
 // src/bin.ts
 async function main() {
-  for (const name of [".env.local", ".env"]) {
-    const envPath = resolve(process.cwd(), name);
-    if (existsSync(envPath)) {
-      (0, import_dotenv.config)({ path: envPath });
-      console.log(`[db-schema-sync] \u2713 Loaded ${name}`);
-    }
+  const envPath = resolve(process.cwd(), ".env");
+  if (existsSync(envPath)) {
+    (0, import_dotenv.config)({ path: envPath });
+    console.log("[db-schema-sync] \u2713 Loaded .env file");
   }
   const cliArgs = parseArgs(process.argv);
   const output = cliArgs.output || process.env.DB_SCHEMA_OUTPUT || "server/database/schema.ts";

package/dist/{chunk-TQCGDNFC.js → chunk-HRE26HBV.js}

@@ -228,21 +228,9 @@ var require_dist = __commonJS({
         };
       }
     };
-    var StaticTokenSource = class {
-      constructor(token) {
-        this.token = token;
-        if (!token) {
-          throw new Error("StaticTokenSource: token \u4E0D\u80FD\u4E3A\u7A7A");
-        }
-      }
-      getToken(_claims) {
-        return this.token;
-      }
-    };
     var DEFAULT_DOMAIN_ENV = "FORCE_AUTHN_INNERAPI_DOMAIN";
     var DEFAULT_ACCESS_KEY_ENV = "FORCE_AUTHN_ACCESS_KEY";
     var DEFAULT_SECRET_KEY_ENV = "FORCE_AUTHN_ACCESS_SECRET";
-    var DEFAULT_TOKEN_ENV = "FORCE_AUTHN_TOKEN";
     var DEFAULT_ADMIN_DOMAIN_ENV = "MIAODA_DEV_INNER_DOMAIN_WITH_PREFIX";
     var DEFAULT_CLIENT_TOKEN_ENV = "MIAODA_AUTHN_CODE";
     var MIAODA_CLIENT_TOKEN_HEADER = "X-Miaoda-Client-Token";
@@ -268,11 +256,6 @@ var require_dist = __commonJS({
       const accessKeyEnv = options.accessKeyEnv || DEFAULT_ACCESS_KEY_ENV;
       const secretKeyEnv = options.secretKeyEnv || DEFAULT_SECRET_KEY_ENV;
       const accessKey = options.accessKey ?? (process.env[accessKeyEnv] || "");
-      if (!accessKey) {
-        throw new Error(
-          `\u5E73\u53F0\u9274\u6743\u9700\u8981 access key,\u8BF7\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF ${accessKeyEnv} \u6216\u4F20 options.accessKey`
-        );
-      }
       const secretKey = options.secretKey ?? (process.env[secretKeyEnv] || "");
       const expireTimeMs = options.expireTimeMs ?? DEFAULT_JWT_EXPIRE_TIME_MS;
       const tokenManager = new JWTTokenManager({
@@ -281,16 +264,6 @@ var require_dist = __commonJS({
         expireTimeMs,
         refreshBeforeMs: options.refreshBeforeMs
       });
-      const tokenEnv = options.tokenEnv || DEFAULT_TOKEN_ENV;
-      const platformToken = options.token ?? (process.env[tokenEnv] || "");
-      const staticTokenSource = platformToken ? new StaticTokenSource(platformToken) : null;
-      if (!staticTokenSource && !secretKey) {
-        throw new Error(
-          `\u5E73\u53F0\u9274\u6743\u9700\u8981 token \u6216 secret key,\u8BF7\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF ${tokenEnv}(\u63A8\u8350) \u6216 ${secretKeyEnv}`
-        );
-      }
-      const primaryTokenSource = staticTokenSource ?? tokenManager;
-      const fallbackTokenSource = staticTokenSource && secretKey ? tokenManager : null;
       const clientTokenEnv = options.clientTokenEnv || DEFAULT_CLIENT_TOKEN_ENV;
       interceptors.request.use((config) => {
         ensureNoAccessKeyOverride("request.platformAuth.customClaims", config.platformAuth?.customClaims);
@@ -299,13 +272,7 @@ var require_dist = __commonJS({
           ...config.platformAuth?.customClaims || {},
           access_key: accessKey
         };
-        let token;
-        try {
-          token = primaryTokenSource.getToken(claims);
-        } catch (err) {
-          if (!fallbackTokenSource) throw err;
-          token = fallbackTokenSource.getToken(claims);
-        }
+        const token = tokenManager.getToken(claims);
         const headers = {
           ...config.headers,
           "Authorization": `Bearer ${token}`,
@@ -1309,17 +1276,11 @@ var primitiveMappers = [
     generate: (f) => `uuid("${escapeDoubleQuote(f.fieldName)}")`,
     imports: () => [{ name: "uuid", from: PG_CORE }]
   },
-  // varchar (honors extraInfo.max_length from listTableView API)
+  // varchar
   {
     name: "varchar",
     match: (f) => f.type === "varchar",
-    generate: (f) => {
-      const maxLength = f.extraInfo?.max_length;
-      if (typeof maxLength === "number" && Number.isInteger(maxLength) && maxLength > 0) {
-        return `varchar("${escapeDoubleQuote(f.fieldName)}", { length: ${maxLength} })`;
-      }
-      return `varchar("${escapeDoubleQuote(f.fieldName)}")`;
-    },
+    generate: (f) => `varchar("${escapeDoubleQuote(f.fieldName)}")`,
     imports: () => [{ name: "varchar", from: PG_CORE }]
   },
   // text
@@ -1540,7 +1501,9 @@ var ImportCollector = class {
 };
 
 // src/generator/default-value.ts
-function formatDefaultValue(value) {
+var CUSTOM_CAST_TYPES = /* @__PURE__ */ new Set(["user_profile", "file_attachment"]);
+var CURRENT_USER_SENTINEL = "current_user";
+function formatDefaultValue(value, field) {
   if (value == null || value === "") return "";
   const trimmed = value.trim();
   if (!trimmed || trimmed.toUpperCase() === "NULL") return "";
@@ -1549,6 +1512,12 @@ function formatDefaultValue(value) {
   if (trimmed === "true") return ".default(true)";
   if (trimmed === "false") return ".default(false)";
   if (/^-?\d+(\.\d+)?$/.test(trimmed)) return `.default(${trimmed})`;
+  if (field && CUSTOM_CAST_TYPES.has(field.type) && !trimmed.includes("::") && trimmed.toLowerCase() !== CURRENT_USER_SENTINEL) {
+    const pgLiteral = trimmed.replace(/'/g, "''");
+    const escaped = pgLiteral.replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+    const cast = field.isArray ? `${field.type}[]` : field.type;
+    return `.default(sql\`'${escaped}'::${cast}\`)`;
+  }
   if (/::|\(|CASE|current_setting/i.test(trimmed)) {
     const escaped = trimmed.replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
     return `.default(sql\`${escaped}\`)`;
@@ -1577,7 +1546,7 @@ var defaultModifiers = [
   {
     name: "defaultValue",
     match: (f) => f.defaultValue != null && f.defaultValue !== "",
-    modify: (f) => formatDefaultValue(f.defaultValue)
+    modify: (f) => formatDefaultValue(f.defaultValue, f)
   }
 ];
 function applyModifiers(field, modifiers) {

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/db-schema-sync",
-  "version": "0.1.6-alpha.2",
+  "version": "0.1.6-alpha.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@lark-apaas/http-client": "0.1.7-alpha.8",
+    "@lark-apaas/http-client": "^0.1.6",
     "dotenv": "^17.3.1",
     "tiny-pinyin": "^1.3.2"
   },