create-windy 0.10.0 → 0.10.1

package/dist/cli.js

@@ -9012,7 +9012,8 @@ var recipes = [
   { id: "starter-0.8.2-to-0.8.3", from: "0.8.2", to: "0.8.3" },
   { id: "starter-0.8.3-to-0.9.0", from: "0.8.3", to: "0.9.0" },
   { id: "starter-0.9.0-to-0.9.1", from: "0.9.0", to: "0.9.1" },
-  { id: "starter-0.9.1-to-0.10.0", from: "0.9.1", to: "0.10.0" }
+  { id: "starter-0.9.1-to-0.10.0", from: "0.9.1", to: "0.10.0" },
+  { id: "starter-0.10.0-to-0.10.1", from: "0.10.0", to: "0.10.1" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (compareVersions2(sourceVersion, minimumSupportedUpdateVersion) < 0) {
@@ -10975,11 +10976,64 @@ async function readJson(path2) {
   return JSON.parse(await readFile19(path2, "utf8"));
 }
 
+// src/update/migration-snapshot.ts
+function canonicalSnapshot(value) {
+  return JSON.stringify(canonicalize(value, true));
+}
+function canonicalize(value, root = false) {
+  if (Array.isArray(value))
+    return value.map((item) => canonicalize(item));
+  if (!value || typeof value !== "object")
+    return value;
+  return Object.fromEntries(Object.entries(value).filter(([key]) => !root || key !== "id" && key !== "prevId").sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, canonicalize(item)]));
+}
+
+// src/update/migration-adoption-equivalence.ts
+var migrationName = "durable_job_lease_snapshot_lookup";
+var tableKey = "public.durable_job_leases";
+var indexName = "idx_durable_job_leases_job_acquired";
+var targetSql = 'CREATE INDEX "idx_durable_job_leases_job_acquired" ON "durable_job_leases" USING btree ("job_id","acquired_at");';
+var projectSql = `CREATE INDEX IF NOT EXISTS "idx_durable_job_leases_job_acquired" ON "durable_job_leases" USING btree ("job_id","acquired_at");
+`;
+var indexDefinition = {
+  name: indexName,
+  columns: ["job_id", "acquired_at"].map((expression) => ({
+    expression,
+    isExpression: false,
+    asc: true,
+    nulls: "last"
+  })),
+  isUnique: false,
+  concurrently: false,
+  method: "btree",
+  with: {}
+};
+function isReviewedMigrationEquivalent(input) {
+  return input.name === migrationName && hashContent(input.targetSql) === hashContent(targetSql) && hashContent(input.projectSql) === hashContent(projectSql) && isExactIndexAddition(input.targetBefore, input.targetAfter) && isExactIndexAddition(input.projectBefore, input.projectAfter);
+}
+function isExactIndexAddition(before, after) {
+  if (before.version !== "7" || after.version !== "7" || before.dialect !== "postgresql" || after.dialect !== "postgresql")
+    return false;
+  const expected = structuredClone(before);
+  if (!isRecord(expected.tables))
+    return false;
+  const table = expected.tables[tableKey];
+  if (!isRecord(table) || table.name !== "durable_job_leases" || !isRecord(table.indexes))
+    return false;
+  if (Object.hasOwn(table.indexes, indexName))
+    return false;
+  table.indexes[indexName] = indexDefinition;
+  return canonicalSnapshot(expected) === canonicalSnapshot(after);
+}
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+
 // src/update/snapshot-delta.ts
 function applySnapshotDelta(before, after, current, path2, conflicts, conflictPath) {
   if (deepEqual(before, after))
     return structuredClone(current);
-  if (!isRecord(before) || !isRecord(after) || !isRecord(current)) {
+  if (!isRecord2(before) || !isRecord2(after) || !isRecord2(current)) {
     if (deepEqual(current, before) || deepEqual(current, after)) {
       return structuredClone(after);
     }
@@ -11013,7 +11067,7 @@ function applySnapshotDelta(before, after, current, path2, conflicts, conflictPa
   }
   return merged;
 }
-function isRecord(value) {
+function isRecord2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function deepEqual(left, right) {
@@ -11041,8 +11095,8 @@ async function inspectPreexistingMigrationAdoptions(input) {
     const projectSqlPath = `${drizzleRoot}/${projectEntry.tag}.sql`;
     const projectSnapshotPath = snapshotPath(projectEntry.tag);
     const [
-      targetSql,
-      projectSql,
+      targetSql2,
+      projectSql2,
       targetBefore,
       targetAfter,
       projectBeforeBytes,
@@ -11055,15 +11109,16 @@ async function inspectPreexistingMigrationAdoptions(input) {
       readProjectFile(input, snapshotPath(previousProject.tag)),
       readProjectFile(input, projectSnapshotPath)
     ]);
-    if (!projectSql || !projectBeforeBytes || !projectAfterBytes) {
+    if (!projectSql2 || !projectBeforeBytes || !projectAfterBytes) {
       conflicts.push(`${journalPath}\uFF1A\u65E0\u6CD5\u91C7\u7EB3\u73B0\u6709\u5E73\u53F0 migration ${name}\uFF0C\u9879\u76EE migration \u6587\u4EF6\u4E0D\u5B8C\u6574`);
       continue;
     }
     const projectBefore = decodeSnapshot(projectBeforeBytes);
     const projectAfter = decodeSnapshot(projectAfterBytes);
     const reason = validateAdoption({
-      targetSql,
-      projectSql,
+      name,
+      targetSql: targetSql2,
+      projectSql: projectSql2,
       targetBefore,
       targetAfter,
       projectBefore,
@@ -11076,19 +11131,22 @@ async function inspectPreexistingMigrationAdoptions(input) {
     adoptions.push({
       sqlPath: projectSqlPath,
       snapshotPath: projectSnapshotPath,
-      sql: projectSql,
+      sql: projectSql2,
       snapshot: projectAfterBytes
     });
   }
   return { adoptions, conflicts };
 }
 function validateAdoption(input) {
-  if (!equalBytes(input.targetSql, input.projectSql)) {
-    return "SQL \u5185\u5BB9\u4E0D\u4E00\u81F4";
+  if (typeof input.targetBefore.id !== "string" || typeof input.targetAfter.id !== "string" || !input.targetBefore.id || !input.targetAfter.id || input.targetAfter.id === input.targetBefore.id || input.targetAfter.prevId !== input.targetBefore.id) {
+    return "\u76EE\u6807 snapshot lineage \u4E0D\u8FDE\u7EED";
   }
-  if (input.projectAfter.prevId !== input.projectBefore.id) {
+  if (typeof input.projectBefore.id !== "string" || typeof input.projectAfter.id !== "string" || !input.projectBefore.id || !input.projectAfter.id || input.projectAfter.id === input.projectBefore.id || input.projectAfter.prevId !== input.projectBefore.id) {
     return "\u9879\u76EE snapshot lineage \u4E0D\u8FDE\u7EED";
   }
+  if (!equalBytes(input.targetSql, input.projectSql) && !isReviewedMigrationEquivalent(input)) {
+    return "SQL \u5185\u5BB9\u4E0D\u4E00\u81F4\u6216\u672A\u6EE1\u8DB3\u5DF2\u5BA1\u6838\u7B49\u4EF7\u89C4\u5219";
+  }
   const deltaConflicts = [];
   const expected = applySnapshotDelta(input.targetBefore, input.targetAfter, input.projectBefore, [], deltaConflicts, journalPath);
   if (deltaConflicts.length || canonicalSnapshot(expected) !== canonicalSnapshot(input.projectAfter)) {
@@ -11101,16 +11159,6 @@ function decodeSnapshot(content) {
 function equalBytes(left, right) {
   return left.byteLength === right.byteLength && left.every((value, index) => value === right[index]);
 }
-function canonicalSnapshot(value) {
-  return JSON.stringify(canonicalize(value, true));
-}
-function canonicalize(value, root = false) {
-  if (Array.isArray(value))
-    return value.map((item) => canonicalize(item));
-  if (!value || typeof value !== "object")
-    return value;
-  return Object.fromEntries(Object.entries(value).filter(([key]) => !root || key !== "id" && key !== "prevId").sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, canonicalize(item)]));
-}
 
 // src/update/migration-reconciler.ts
 async function reconcileDrizzleMigrations(input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-windy",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "创建单组织、单租户、私有部署优先的 Windy 企业 Dashboard Starter",
   "type": "module",
   "bin": {

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "30a73d57ac4b83d1bee4bf412be7f6abbdc351f8",
-  "generatorVersion": "0.10.0",
+  "templateCommit": "266b77d1fad69f8cfa00f96fc09c7b494c1dc71d",
+  "generatorVersion": "0.10.1",
   "modules": [
     {
       "name": "system",