@rocicorp/zero 0.18.2025040200 → 0.18.2025040201
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/{chunk-CT4LRQ5P.js → chunk-242YQPIZ.js} +2 -2
- package/out/solid.js +1 -1
- package/out/z2s/src/sql.d.ts.map +1 -1
- package/out/z2s/src/sql.js +3 -1
- package/out/z2s/src/sql.js.map +1 -1
- package/out/zero-pg/src/custom.js +13 -4
- package/out/zero-pg/src/custom.js.map +1 -1
- package/out/zero-pg/src/schema.d.ts +1 -0
- package/out/zero-pg/src/schema.d.ts.map +1 -1
- package/out/zero-pg/src/schema.js +5 -3
- package/out/zero-pg/src/schema.js.map +1 -1
- package/out/zero.js +1 -1
- package/package.json +1 -1
- /package/out/{chunk-CT4LRQ5P.js.map → chunk-242YQPIZ.js.map} +0 -0
|
@@ -8414,7 +8414,7 @@ function makeMessage(message, context, logLevel) {
|
|
|
8414
8414
|
}
|
|
8415
8415
|
|
|
8416
8416
|
// ../zero-client/src/client/version.ts
|
|
8417
|
-
var version2 = "0.18.
|
|
8417
|
+
var version2 = "0.18.2025040201";
|
|
8418
8418
|
|
|
8419
8419
|
// ../zero-client/src/client/log-options.ts
|
|
8420
8420
|
var LevelFilterLogSink = class {
|
|
@@ -10962,4 +10962,4 @@ export {
|
|
|
10962
10962
|
escapeLike,
|
|
10963
10963
|
Zero
|
|
10964
10964
|
};
|
|
10965
|
-
//# sourceMappingURL=chunk-
|
|
10965
|
+
//# sourceMappingURL=chunk-242YQPIZ.js.map
|
package/out/solid.js
CHANGED
package/out/z2s/src/sql.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../../z2s/src/sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,OAAsB,MAAM,gBAAgB,CAAC;AAMpD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAGpD,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,wBAAgB,QAAQ,CAAC,GAAG,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../../z2s/src/sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,OAAsB,MAAM,gBAAgB,CAAC;AAMpD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAGpD,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,wBAAgB,QAAQ,CAAC,GAAG,EAAE,QAAQ;UAsQ9B,MAAM;YACJ,OAAO,EAAE;EApQlB;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,QAAQ;UAiQ7C,MAAM;YACJ,OAAO,EAAE;EA/PlB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ;UA4PlC,MAAM;YACJ,OAAO,EAAE;EA1PlB;AAGD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AACnE,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AAsB7D,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GACtC,QAAQ,CAQV;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,iBAAiB,EAAE,GACzB,QAAQ,CAQV;AAED,wBAAgB,mBAAmB,CACjC,kBAAkB,EAAE,kBAAkB,EACtC,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,OAAO,GACpB,QAAQ,CASV;AAiLD,eAAO,MAAM,GAAG,aAAkB,CAAC"}
|
package/out/z2s/src/sql.js
CHANGED
|
@@ -74,7 +74,9 @@ function stringify(arg) {
|
|
|
74
74
|
return arg.value;
|
|
75
75
|
}
|
|
76
76
|
if (arg[sqlConvert] === 'column' &&
|
|
77
|
-
(arg.
|
|
77
|
+
(arg.isEnum ||
|
|
78
|
+
arg.type === 'uuid' ||
|
|
79
|
+
arg.type === 'bpchar' ||
|
|
78
80
|
arg.type === 'character' ||
|
|
79
81
|
arg.type === 'text' ||
|
|
80
82
|
arg.type === 'character varying' ||
|
package/out/z2s/src/sql.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../../z2s/src/sql.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../../z2s/src/sql.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ function makeTableCRUD(schema) {
|
|
|
57
57
|
async insert(value) {
|
|
58
58
|
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
59
59
|
const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
|
|
60
|
-
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, v]) =>
|
|
60
|
+
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, v]) => sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)])), ', ')})`);
|
|
61
61
|
const tx = this[dbTxSymbol];
|
|
62
62
|
await tx.query(stmt.text, stmt.values);
|
|
63
63
|
},
|
|
@@ -65,14 +65,14 @@ function makeTableCRUD(schema) {
|
|
|
65
65
|
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
66
66
|
const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
|
|
67
67
|
const primaryKeyColumns = origAndServerNamesFor(schema.primaryKey, schema);
|
|
68
|
-
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, val]) =>
|
|
68
|
+
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, val]) => sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])), ', ')}) ON CONFLICT (${sql.join(primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)), ', ')}) DO UPDATE SET ${sql.join(Object.entries(value).map(([col, val]) => sql `${sql.ident(schema.columns[col].serverName ?? col)} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`), ', ')}`);
|
|
69
69
|
const tx = this[dbTxSymbol];
|
|
70
70
|
await tx.query(stmt.text, stmt.values);
|
|
71
71
|
},
|
|
72
72
|
async update(value) {
|
|
73
73
|
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
74
74
|
const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
|
|
75
|
-
const stmt = formatPgInternalConvert(sql `UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(targetedColumns.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${
|
|
75
|
+
const stmt = formatPgInternalConvert(sql `UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(targetedColumns.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName])}`), ', ')} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`);
|
|
76
76
|
const tx = this[dbTxSymbol];
|
|
77
77
|
await tx.query(stmt.text, stmt.values);
|
|
78
78
|
},
|
|
@@ -89,7 +89,13 @@ function serverName(x) {
|
|
|
89
89
|
}
|
|
90
90
|
function primaryKeyClause(schema, serverTableSchema, row) {
|
|
91
91
|
const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);
|
|
92
|
-
return sql `${sql.join(primaryKey.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlValue(row[origName], serverTableSchema[serverName])}`), ' AND ')}`;
|
|
92
|
+
return sql `${sql.join(primaryKey.map(([origName, serverName]) => sql `${sql.ident(serverName)}${maybeCastColumn(serverTableSchema[serverName])} = ${sqlValue(row[origName], serverTableSchema[serverName])}`), ' AND ')}`;
|
|
93
|
+
}
|
|
94
|
+
function maybeCastColumn(col) {
|
|
95
|
+
if (col.type === 'uuid' || col.isEnum) {
|
|
96
|
+
return sql `::text`;
|
|
97
|
+
}
|
|
98
|
+
return sql ``;
|
|
93
99
|
}
|
|
94
100
|
function origAndServerNamesFor(originalNames, schema) {
|
|
95
101
|
return originalNames.map(name => [name, serverNameFor(name, schema)]);
|
|
@@ -101,4 +107,7 @@ function serverNameFor(originalName, schema) {
|
|
|
101
107
|
function sqlValue(value, serverColumnSchema) {
|
|
102
108
|
return sqlConvertColumnArg(serverColumnSchema, value, false, true);
|
|
103
109
|
}
|
|
110
|
+
function sqlInsertValue(value, serverColumnSchema) {
|
|
111
|
+
return sqlConvertColumnArg(serverColumnSchema, value, false, false);
|
|
112
|
+
}
|
|
104
113
|
//# sourceMappingURL=custom.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../zero-pg/src/custom.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../zero-pg/src/custom.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export type ServerSchemaRow = {
|
|
|
7
7
|
column: string;
|
|
8
8
|
type: string;
|
|
9
9
|
enum: string;
|
|
10
|
+
enumtype: string;
|
|
10
11
|
};
|
|
11
12
|
export declare function getServerSchema<S extends Schema>(dbTransaction: DBTransaction<unknown>, schema: S): Promise<ServerSchema>;
|
|
12
13
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAyEvB"}
|
|
@@ -25,7 +25,8 @@ export async function getServerSchema(dbTransaction, schema) {
|
|
|
25
25
|
c.table_name::text AS table,
|
|
26
26
|
c.column_name::text AS column,
|
|
27
27
|
c.data_type::text AS type,
|
|
28
|
-
(t.typtype = 'e')::text AS enum
|
|
28
|
+
(t.typtype = 'e')::text AS enum,
|
|
29
|
+
t.typname::text AS enumtype
|
|
29
30
|
FROM
|
|
30
31
|
information_schema.columns c
|
|
31
32
|
JOIN
|
|
@@ -45,9 +46,10 @@ export async function getServerSchema(dbTransaction, schema) {
|
|
|
45
46
|
tableSchema = {};
|
|
46
47
|
serverSchema[tableName] = tableSchema;
|
|
47
48
|
}
|
|
49
|
+
const isEnum = row.enum.toLowerCase().startsWith('t');
|
|
48
50
|
tableSchema[row.column] = {
|
|
49
|
-
type: row.type,
|
|
50
|
-
isEnum
|
|
51
|
+
type: isEnum ? row.enumtype : row.type,
|
|
52
|
+
isEnum,
|
|
51
53
|
};
|
|
52
54
|
}
|
|
53
55
|
// Validate that schema.ts is a valid subset of serverSchema and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,GAAG,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,GAAG,EAAC,MAAM,sBAAsB,CAAC;AAanD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAAqC,EACrC,MAAS;IAET,MAAM,gBAAgB,GAAuB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAC3E,CAAC,EAAC,IAAI,EAAE,UAAU,EAAC,EAAE,EAAE;QACrB,IAAI,eAAe,GAAqB,CAAC,QAAQ,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;QACvE,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC;gBACrB,eAAe,GAAG;oBAChB,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC;oBACpC,UAAU,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;iBACzD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC,CACF,CAAC;IAEF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC,CAAC,wBAAwB;IACrC,CAAC;IAED,2DAA2D;IAC3D,oEAAoE;IACpE,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CACvB,gBAAgB,CAAC,GAAG,CAClB,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA,IAAI,MAAM,WAAW,KAAK,SAAS,CAC5D,EACD,GAAG,CACJ,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;+CAe4B,QAAQ;KAClD,CAAC;IACJ,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAA8B,CAAC,MAAM,aAAa,CAAC,KAAK,CACnE,IAAI,EACJ,MAAM,CACP,CAA8B,CAAC;IAEhC,MAAM,YAAY,GAAiB,EAAE,CAAC;IAEtC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,SAAS,GACb,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACrE,IAAI,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,WAAW,GAAG,EAAE,CAAC;YACjB,YAAY,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;QACxC,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG;YACxB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;YACtC,MAAM;SACP,CAAC;IACJ,CAAC;IAED,gEAAgE;IAChE,wBAAwB;IAExB,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
package/out/zero.js
CHANGED
package/package.json
CHANGED
|
File without changes
|