@lark-apaas/db-schema-sync 0.1.6-beta.0 → 0.1.7-alpha.0

package/dist/bin.js

@@ -6,7 +6,7 @@ import {
   __toESM,
   generateSchema,
   resolveEnvOptions
-} from "./chunk-SWKVIZTR.js";
+} from "./chunk-JOLAF4EV.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-SWKVIZTR.js → chunk-JOLAF4EV.js}

@@ -56,7 +56,6 @@ var require_dist = __commonJS({
     __export(index_exports, {
       DEFAULT_CLOCK_TOLERANCE_SEC: () => DEFAULT_CLOCK_TOLERANCE_SEC,
       DEFAULT_JWT_EXPIRE_TIME_MS: () => DEFAULT_JWT_EXPIRE_TIME_MS,
-      FileTokenProvider: () => FileTokenProvider,
       HttpClient: () => HttpClient2,
       HttpError: () => HttpError,
       generateJWTToken: () => generateJWTToken,
@@ -229,92 +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 import_fs = __require("fs");
-    var DEFAULT_REFRESH_BEFORE_MS = 5 * 60 * 1e3;
-    var DEFAULT_TOKEN_PATHS = [
-      "/home/gem/workspace/.force/openclaw/miaoda-provider-key"
-    ];
-    var FileTokenProvider = class {
-      cache = /* @__PURE__ */ new Map();
-      paths;
-      refreshBeforeMs;
-      constructor(config) {
-        this.paths = config?.paths ?? DEFAULT_TOKEN_PATHS;
-        this.refreshBeforeMs = config?.refreshBeforeMs ?? DEFAULT_REFRESH_BEFORE_MS;
-      }
-      /**
-       * 获取 token，按路径优先级依次尝试
-       *
-       * 1. 缓存有效且不在刷新窗口 → 直接返回
-       * 2. 进入刷新窗口 → 重读文件，更新缓存
-       * 3. 文件未更新但缓存未过期 → 仍返回旧缓存
-       * 4. 所有路径均无有效 token → 返回 null
-       */
-      getToken() {
-        const now = Date.now();
-        for (const filePath of this.paths) {
-          const cached = this.cache.get(filePath);
-          if (cached && cached.expiresAtMs - now > this.refreshBeforeMs) {
-            return { token: cached.token, accessKey: cached.accessKey };
-          }
-          const result = this.readAndParse(filePath);
-          if (result) {
-            this.cache.set(filePath, result);
-            if (result.expiresAtMs > now) {
-              return { token: result.token, accessKey: result.accessKey };
-            }
-          }
-          if (cached && cached.expiresAtMs > now) {
-            return { token: cached.token, accessKey: cached.accessKey };
-          }
-        }
-        return null;
-      }
-      clearCache() {
-        this.cache.clear();
-      }
-      readAndParse(filePath) {
-        try {
-          const token = (0, import_fs.readFileSync)(filePath, "utf-8").trim();
-          if (!token) return null;
-          const payload = this.decodePayload(token);
-          if (!payload?.exp) return null;
-          return {
-            token,
-            accessKey: payload.access_key ?? "",
-            expiresAtMs: payload.exp * 1e3
-          };
-        } catch {
-          return null;
-        }
-      }
-      decodePayload(token) {
-        try {
-          const segments = token.split(".");
-          if (segments.length !== 3) return null;
-          const padLength = (4 - (segments[1].length % 4 || 4)) % 4;
-          const padded = `${segments[1]}${"=".repeat(padLength)}`.replace(/-/g, "+").replace(/_/g, "/");
-          return JSON.parse(Buffer.from(padded, "base64").toString("utf8"));
-        } catch {
-          return null;
-        }
-      }
-    };
     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";
@@ -337,13 +253,6 @@ var require_dist = __commonJS({
         return void 0;
       }
       ensureNoAccessKeyOverride("platform.defaultClaims", options.defaultClaims);
-      let fileTokenProvider;
-      if (options.tokenProvider?.type === "file") {
-        fileTokenProvider = new FileTokenProvider({
-          paths: options.tokenProvider.paths,
-          refreshBeforeMs: options.refreshBeforeMs
-        });
-      }
       const accessKeyEnv = options.accessKeyEnv || DEFAULT_ACCESS_KEY_ENV;
       const secretKeyEnv = options.secretKeyEnv || DEFAULT_SECRET_KEY_ENV;
       const accessKey = options.accessKey ?? (process.env[accessKeyEnv] || "");
@@ -355,38 +264,15 @@ 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;
       const clientTokenEnv = options.clientTokenEnv || DEFAULT_CLIENT_TOKEN_ENV;
       interceptors.request.use((config) => {
-        if (fileTokenProvider) {
-          const fileToken = fileTokenProvider.getToken();
-          if (fileToken) {
-            const headers2 = {
-              ...config.headers,
-              "Authorization": `Bearer ${fileToken.token}`,
-              "x-api-key": fileToken.accessKey
-            };
-            return { ...config, headers: headers2 };
-          }
-        }
         ensureNoAccessKeyOverride("request.platformAuth.customClaims", config.platformAuth?.customClaims);
         const claims = {
           ...options.defaultClaims || {},
           ...config.platformAuth?.customClaims || {},
           access_key: accessKey
         };
-        let token;
-        if (staticTokenSource) {
-          try {
-            token = staticTokenSource.getToken(claims);
-          } catch {
-            token = tokenManager.getToken(claims);
-          }
-        } else {
-          token = tokenManager.getToken(claims);
-        }
+        const token = tokenManager.getToken(claims);
         const headers = {
           ...config.headers,
           "Authorization": `Bearer ${token}`,
@@ -1621,9 +1507,7 @@ var ImportCollector = class {
 };
 
 // src/generator/default-value.ts
-var CUSTOM_CAST_TYPES = /* @__PURE__ */ new Set(["user_profile", "file_attachment"]);
-var CURRENT_USER_SENTINEL = "current_user";
-function formatDefaultValue(value, field) {
+function formatDefaultValue(value) {
   if (value == null || value === "") return "";
   const trimmed = value.trim();
   if (!trimmed || trimmed.toUpperCase() === "NULL") return "";
@@ -1632,12 +1516,6 @@ function formatDefaultValue(value, field) {
   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}\`)`;
@@ -1666,7 +1544,7 @@ var defaultModifiers = [
   {
     name: "defaultValue",
     match: (f) => f.defaultValue != null && f.defaultValue !== "",
-    modify: (f) => formatDefaultValue(f.defaultValue, f)
+    modify: (f) => formatDefaultValue(f.defaultValue)
   }
 ];
 function applyModifiers(field, modifiers) {
@@ -2058,7 +1936,7 @@ var inlineTypesEnhancer = {
       );
       if (pgCoreImportMatch) {
         const insertPoint = text.indexOf(pgCoreImportMatch[0]) + pgCoreImportMatch[0].length;
-        text = text.slice(0, insertPoint) + "import { sql } from 'drizzle-orm';\n" + text.slice(insertPoint);
+        text = text.slice(0, insertPoint) + 'import { sql } from "drizzle-orm";\n' + text.slice(insertPoint);
       }
     }
     const definitions = [];
@@ -2099,7 +1977,14 @@ function ensureImportIdentifier(source, packageName, identifier) {
   );
   const match = source.match(importRegex);
   if (!match) {
-    return source;
+    const importLine = `import { ${identifier} } from "${packageName}";
+`;
+    const headerPrefix = `${FULL_HEADER}
+`;
+    if (source.startsWith(headerPrefix)) {
+      return source.slice(0, headerPrefix.length) + importLine + source.slice(headerPrefix.length);
+    }
+    return importLine + source;
   }
   const identifiers = match[1].split(",").map((id) => id.trim()).filter(Boolean);
   if (identifiers.includes(identifier)) {

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/db-schema-sync",
-  "version": "0.1.6-beta.0",
+  "version": "0.1.7-alpha.0",
   "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-beta.0",
+    "@lark-apaas/http-client": "^0.1.6",
     "dotenv": "^17.3.1",
     "tiny-pinyin": "^1.3.2"
   },