zeed 1.4.0 → 1.8.0

package/dist/common/msg/rpc.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.mjs","names":[],"sources":["../../../src/common/msg/rpc.ts"],"sourcesContent":["// From https://github.com/antfu/birpc/blob/main/src/index.ts MIT\n\nimport type { UseStringHashPool } from '../data/string-hash-pool'\nimport type { LoggerInterface } from '../log/log-base'\nimport type { Pipe } from './pipe'\nimport { createPromise } from '../exec/promise'\n\nexport type ArgumentsType<T> = T extends (...args: infer A) => any ? A : never\nexport type ReturnType<T> = T extends (...args: any) => infer R ? R : never\n\nexport interface RPCOptionsBasic extends Pipe {\n  /** No return values expected */\n  onlyEvents?: boolean\n  /** Maximum timeout for waiting for response, in milliseconds */\n  timeout?: number\n  /** Custom logger */\n  log?: LoggerInterface\n  /** Custom error handler */\n  onError?: (error: Error, functionName: string, args: any[]) => boolean | void\n  /** Custom error handler for timeouts */\n  onTimeoutError?: (functionName: string, args: any[]) => boolean | void\n  /** Throw execptions. Default: true */\n  exceptions?: boolean\n  /**  */\n  stringHashPool?: UseStringHashPool\n}\n\nexport interface RPCOptions<Remote> extends RPCOptionsBasic {\n  // /** No return values expected */\n  // onlyEvents?: boolean\n  /** Names of remote functions that do not need response. */\n  eventNames?: (keyof Remote)[]\n}\n\nexport interface RPCFn<T> {\n  /** Call the remote function and wait for the result. */\n  (...args: ArgumentsType<T>): Promise<Awaited<ReturnType<T>>>\n  /** Send event without asking for response */\n  asEvent: (...args: ArgumentsType<T>) => void\n}\n\nexport type RPCReturn<RemoteFunctions> = {\n  [K in keyof RemoteFunctions]: RPCFn<RemoteFunctions[K]>\n}\n\nlet rpcCounter = 1\n\nexport enum RPCMode {\n  request = 1,\n  event = 2,\n  resolve = 3,\n  reject = 4,\n}\n\nexport type RPCMessage = [\n  mode: RPCMode,\n  id: number,\n  method: string | number | any,\n  ...any,\n]\n\nconst defaultSerialize = (i: any) => i\nconst defaultDeserialize = defaultSerialize\n\nfunction setupRPCBasic(options: RPCOptionsBasic, functions: Record<string, (...args: any) => Promise<any>>, eventNames: string[] = []) {\n  const {\n    log,\n    post,\n    on,\n    serialize = defaultSerialize,\n    deserialize = defaultDeserialize,\n    timeout = 60e3,\n    onError,\n    onTimeoutError,\n    onlyEvents = false,\n    exceptions = true,\n    stringHashPool,\n  } = options\n\n  if (stringHashPool) {\n    Object.keys(functions).forEach(stringHashPool.hash)\n  }\n\n  function checkEventNames(eventNames: string[]) {\n    // eventNames.forEach((n) => {\n    //   if (functions[n] == null)\n    //     throw new Error(`event name ${n} has no registered function`)\n    // })\n  }\n\n  checkEventNames(eventNames)\n\n  function registerFunctions(additionalFunctions: any) {\n    Object.assign(functions, additionalFunctions ?? {})\n    if (stringHashPool)\n      Object.keys(additionalFunctions).forEach(stringHashPool.hash)\n  }\n\n  function registerEventNames(additionalEventNames: string[]) {\n    checkEventNames(additionalEventNames)\n    eventNames.push(...additionalEventNames)\n  }\n\n  const rpcPromiseMap = new Map<number, {\n    resolve: (...args: any) => any\n    reject: (...args: any) => any\n    timeoutId: Parameters<typeof clearTimeout>[0]\n  }>()\n\n  on(async (data) => {\n    try {\n      const msg = await deserialize(data) as RPCMessage\n      const mode = msg?.[0]\n      const id = mode === RPCMode.event ? 0 : msg?.[1]\n      const [method, ...args] = msg.slice(mode === RPCMode.event ? 1 : 2)\n      const methodName = stringHashPool?.stringForHash(method) ?? method\n      if (mode === RPCMode.request || mode === RPCMode.event) {\n        let result, error: any\n        if (method != null) {\n          try {\n            const fn = functions[methodName]\n            result = await fn(...args)\n          }\n          catch (e) {\n            error = String(e)\n          }\n        }\n        else {\n          error = 'Method implementation missing'\n        }\n        if (error) {\n          log?.warn('error', msg, error)\n          onError?.(error, method ?? '', args)\n        }\n        if (id > 0) {\n          const data = await serialize(error\n            ? [RPCMode.reject, id, error]\n            : [RPCMode.resolve, id, result])\n          await post(data)\n        }\n      }\n      else if (id) {\n        const promise = rpcPromiseMap.get(id)\n        if (promise != null) {\n          clearTimeout(promise.timeoutId)\n          if (mode === RPCMode.reject && exceptions === true)\n            promise.reject(method)\n          else\n            promise.resolve(method)\n        }\n        rpcPromiseMap.delete(id)\n      }\n    }\n    catch (err) {\n      log?.warn('Error on handling RPC data. Invalid?', err, data)\n    }\n  })\n\n  const proxyHandler = {\n    get(_: any, methodName: string) {\n      const method = stringHashPool?.hash(methodName) ?? methodName\n      const sendEvent = async (...args: any[]) => await post(await serialize([RPCMode.event, method, ...args]))\n\n      if (onlyEvents || eventNames.includes(methodName)) {\n        sendEvent.asEvent = sendEvent\n        return sendEvent\n      }\n\n      const sendCall = async (...args: any[]) => {\n        const [promise, resolve, reject] = createPromise()\n        const id = rpcCounter++\n\n        let timeoutId: any\n        if (timeout >= 0) {\n          timeoutId = setTimeout(() => {\n            try {\n              // Custom onTimeoutError handler can throw its own error too\n              onTimeoutError?.(methodName, args)\n              throw new Error(`rpc timeout on calling \"${methodName}\"`)\n            }\n            catch (e) {\n              if (exceptions === true)\n                reject(e)\n              else\n                resolve(undefined)\n            }\n            rpcPromiseMap.delete(id)\n\n            // Garbage Collection https://jakearchibald.com/2024/garbage-collection-and-closures/\n            clearTimeout(timeoutId)\n            timeoutId = undefined\n          }, timeout).unref?.()\n        }\n\n        rpcPromiseMap.set(id, { resolve, reject, timeoutId })\n        const data = await serialize([RPCMode.request, id, method, ...args])\n        await post(data)\n        return promise\n      }\n      sendCall.asEvent = sendEvent\n      return sendCall\n    },\n  }\n\n  return {\n    post,\n    serialize,\n    rpcPromiseMap,\n    proxyHandler,\n    registerFunctions,\n    registerEventNames,\n  }\n}\n\nexport function useRPC<LocalFunctions, RemoteFunctions = LocalFunctions>(\n  functions: LocalFunctions,\n  options: RPCOptions<RemoteFunctions>,\n): RPCReturn<RemoteFunctions> {\n  const { eventNames = [] } = options\n\n  const { proxyHandler } = setupRPCBasic(options, functions as any, eventNames as any)\n\n  return new Proxy({}, proxyHandler)\n}\n\nexport function useRPCHub(options: RPCOptionsBasic) {\n  const eventNames: string[] = []\n  const functions: Record<string, any> = {}\n\n  const {\n    proxyHandler,\n    registerFunctions,\n    registerEventNames,\n  } = setupRPCBasic(options, functions, eventNames)\n\n  function createRPCProxy() {\n    return new Proxy({}, proxyHandler)\n  }\n\n  return function<LocalFunctions, RemoteFunctions = LocalFunctions>(\n    additionalFunctions?: LocalFunctions,\n    additionalEventNames: string[] = [],\n  ): RPCReturn<RemoteFunctions> {\n    registerFunctions(additionalFunctions ?? {})\n    registerEventNames(additionalEventNames)\n    return createRPCProxy()\n  }\n}\n\nexport type UseRPCHubType = ReturnType<typeof useRPCHub>\n\n// Syntax test case\n// async function _demo() {\n//   const hub: UseRPCHubType = {} as any\n//   const x = hub({\n//     test(name: string): string {\n//       return name\n//     },\n//   })\n//   await x.test('dsd')\n// }\n"],"mappings":"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"}
+{"version":3,"file":"rpc.mjs","names":[],"sources":["../../../src/common/msg/rpc.ts"],"sourcesContent":["// From https://github.com/antfu/birpc/blob/main/src/index.ts MIT\n\nimport type { UseStringHashPool } from '../data/string-hash-pool'\nimport type { LoggerInterface } from '../log/log-base'\nimport type { Pipe } from './pipe'\nimport { createPromise } from '../exec/promise'\n\nexport type ArgumentsType<T> = T extends (...args: infer A) => any ? A : never\nexport type ReturnType<T> = T extends (...args: any) => infer R ? R : never\n\nexport interface RPCOptionsBasic extends Pipe {\n  /** No return values expected */\n  onlyEvents?: boolean\n  /** Maximum timeout for waiting for response, in milliseconds */\n  timeout?: number\n  /** Custom logger */\n  log?: LoggerInterface\n  /** Custom error handler */\n  onError?: (error: Error, functionName: string, args: any[]) => boolean | void\n  /** Custom error handler for timeouts */\n  onTimeoutError?: (functionName: string, args: any[]) => boolean | void\n  /** Throw execptions. Default: true */\n  exceptions?: boolean\n  /**  */\n  stringHashPool?: UseStringHashPool\n}\n\nexport interface RPCOptions<Remote> extends RPCOptionsBasic {\n  // /** No return values expected */\n  // onlyEvents?: boolean\n  /** Names of remote functions that do not need response. */\n  eventNames?: (keyof Remote)[]\n}\n\nexport interface RPCFn<T> {\n  /** Call the remote function and wait for the result. */\n  (...args: ArgumentsType<T>): Promise<Awaited<ReturnType<T>>>\n  /** Send event without asking for response */\n  asEvent: (...args: ArgumentsType<T>) => void\n}\n\nexport type RPCReturn<RemoteFunctions> = {\n  [K in keyof RemoteFunctions]: RPCFn<RemoteFunctions[K]>\n}\n\nlet rpcCounter = 1\n\nexport enum RPCMode {\n  request = 1,\n  event = 2,\n  resolve = 3,\n  reject = 4,\n}\n\nexport type RPCMessage = [\n  mode: RPCMode,\n  id: number,\n  method: string | number | any,\n  ...any,\n]\n\nconst defaultSerialize = (i: any) => i\nconst defaultDeserialize = defaultSerialize\n\nfunction setupRPCBasic(options: RPCOptionsBasic, functions: Record<string, (...args: any) => Promise<any>>, eventNames: string[] = []) {\n  const {\n    log,\n    post,\n    on,\n    serialize = defaultSerialize,\n    deserialize = defaultDeserialize,\n    timeout = 60e3,\n    onError,\n    onTimeoutError,\n    onlyEvents = false,\n    exceptions = true,\n    stringHashPool,\n  } = options\n\n  if (stringHashPool) {\n    Object.keys(functions).forEach(stringHashPool.hash)\n  }\n\n  function checkEventNames(eventNames: string[]) {\n    // eventNames.forEach((n) => {\n    //   if (functions[n] == null)\n    //     throw new Error(`event name ${n} has no registered function`)\n    // })\n  }\n\n  checkEventNames(eventNames)\n\n  function registerFunctions(additionalFunctions: any) {\n    Object.assign(functions, additionalFunctions ?? {})\n    if (stringHashPool)\n      Object.keys(additionalFunctions).forEach(stringHashPool.hash)\n  }\n\n  function registerEventNames(additionalEventNames: string[]) {\n    checkEventNames(additionalEventNames)\n    eventNames.push(...additionalEventNames)\n  }\n\n  const rpcPromiseMap = new Map<number, {\n    resolve: (...args: any) => any\n    reject: (...args: any) => any\n    timeoutId: Parameters<typeof clearTimeout>[0]\n  }>()\n\n  on(async (data) => {\n    try {\n      const msg = await deserialize(data) as RPCMessage\n      const mode = msg?.[0]\n      const id = mode === RPCMode.event ? 0 : msg?.[1]\n      const [method, ...args] = msg.slice(mode === RPCMode.event ? 1 : 2)\n      const methodName = stringHashPool?.stringForHash(method) ?? method\n      if (mode === RPCMode.request || mode === RPCMode.event) {\n        let result, error: any\n        if (method != null) {\n          try {\n            const fn = functions[methodName]\n            result = await fn(...args)\n          }\n          catch (e) {\n            error = String(e)\n          }\n        }\n        else {\n          error = 'Method implementation missing'\n        }\n        if (error) {\n          log?.warn('error', msg, error)\n          onError?.(error, method ?? '', args)\n        }\n        if (id > 0) {\n          const data = await serialize(error\n            ? [RPCMode.reject, id, error]\n            : [RPCMode.resolve, id, result])\n          await post(data)\n        }\n      }\n      else if (id) {\n        const promise = rpcPromiseMap.get(id)\n        if (promise != null) {\n          clearTimeout(promise.timeoutId)\n          if (mode === RPCMode.reject && exceptions === true)\n            promise.reject(method)\n          else\n            promise.resolve(method)\n        }\n        rpcPromiseMap.delete(id)\n      }\n    }\n    catch (err) {\n      log?.warn('Error on handling RPC data. Invalid?', err, data)\n    }\n  })\n\n  const proxyHandler = {\n    get(_: any, methodName: string) {\n      const method = stringHashPool?.hash(methodName) ?? methodName\n      const sendEvent = async (...args: any[]) => await post(await serialize([RPCMode.event, method, ...args]))\n\n      if (onlyEvents || eventNames.includes(methodName)) {\n        sendEvent.asEvent = sendEvent\n        return sendEvent\n      }\n\n      const sendCall = async (...args: any[]) => {\n        const [promise, resolve, reject] = createPromise()\n        const id = rpcCounter++\n\n        let timeoutId: any\n        if (timeout >= 0) {\n          timeoutId = setTimeout(() => {\n            try {\n              // Custom onTimeoutError handler can throw its own error too\n              onTimeoutError?.(methodName, args)\n              throw new Error(`rpc timeout on calling \"${methodName}\"`)\n            }\n            catch (e) {\n              if (exceptions === true)\n                reject(e)\n              else\n                resolve(undefined)\n            }\n            rpcPromiseMap.delete(id)\n\n            // Garbage Collection https://jakearchibald.com/2024/garbage-collection-and-closures/\n            clearTimeout(timeoutId)\n            timeoutId = undefined\n          }, timeout).unref?.()\n        }\n\n        rpcPromiseMap.set(id, { resolve, reject, timeoutId })\n        const data = await serialize([RPCMode.request, id, method, ...args])\n        await post(data)\n        return promise\n      }\n      sendCall.asEvent = sendEvent\n      return sendCall\n    },\n  }\n\n  return {\n    post,\n    serialize,\n    rpcPromiseMap,\n    proxyHandler,\n    registerFunctions,\n    registerEventNames,\n  }\n}\n\nexport function useRPC<LocalFunctions, RemoteFunctions = LocalFunctions>(\n  functions: LocalFunctions,\n  options: RPCOptions<RemoteFunctions>,\n): RPCReturn<RemoteFunctions> {\n  const { eventNames = [] } = options\n\n  const { proxyHandler } = setupRPCBasic(options, functions as any, eventNames as any)\n\n  return new Proxy({}, proxyHandler)\n}\n\nexport function useRPCHub(options: RPCOptionsBasic) {\n  const eventNames: string[] = []\n  const functions: Record<string, any> = {}\n\n  const {\n    proxyHandler,\n    registerFunctions,\n    registerEventNames,\n  } = setupRPCBasic(options, functions, eventNames)\n\n  function createRPCProxy() {\n    return new Proxy({}, proxyHandler)\n  }\n\n  return function<LocalFunctions, RemoteFunctions = LocalFunctions>(\n    additionalFunctions?: LocalFunctions,\n    additionalEventNames: string[] = [],\n  ): RPCReturn<RemoteFunctions> {\n    registerFunctions(additionalFunctions ?? {})\n    registerEventNames(additionalEventNames)\n    return createRPCProxy()\n  }\n}\n\nexport type UseRPCHubType = ReturnType<typeof useRPCHub>\n\n// Syntax test case\n// async function _demo() {\n//   const hub: UseRPCHubType = {} as any\n//   const x = hub({\n//     test(name: string): string {\n//       return name\n//     },\n//   })\n//   await x.test('dsd')\n// }\n"],"mappings":"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"}

package/dist/common/schema/export-json-schema.cjs

@@ -1,46 +1,55 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_common_data_is = require('../data/is.cjs');
-const require_common_data_object = require('../data/object.cjs');
 
 //#region src/common/schema/export-json-schema.ts
-const _mapJsonSchemaType = {
+const _primitiveMap = {
 	string: "string",
 	number: "number",
-	boolean: "boolean",
-	int: "integer"
+	int: "integer",
+	boolean: "boolean"
 };
-function schemaExportJsonSchema(schema) {
-	function transformSchema(schema) {
-		const type = _mapJsonSchemaType[schema.type] ?? schema.type ?? "object";
+function transformSchema(schema) {
+	const out = {};
+	if (schema._enumValues) {
+		out.type = _primitiveMap[schema.type] ?? schema.type;
+		out.enum = [...schema._enumValues];
+	} else if (schema.type === "literal") out.const = schema._default;
+	else if (schema.type === "union" && Array.isArray(schema._union)) out.anyOf = schema._union.map((s) => transformSchema(s));
+	else if (schema.type === "object" && schema._object) {
+		out.type = "object";
 		const properties = {};
 		const required = [];
-		require_common_data_object.objectMap(schema._object, (key, schema) => {
-			properties[key] = { type: _mapJsonSchemaType[schema.type] ?? schema.type };
-			const enumValues = schema._enumValues;
-			if (enumValues) properties[key].enum = enumValues;
-			if (schema._default !== void 0) properties[key].default = schema._default;
-			if (schema._meta?.desc) properties[key].description = schema._meta.desc;
-			if (schema._optional !== true) required.push(key);
-			if (schema.type === "array" && schema._type) properties[key].items = transformSchema(schema._type);
-			else if (schema.type === "object" && schema._object) {
-				Object.assign(properties[key], transformSchema(schema));
-				properties[key].additionalProperties = false;
-			} else if (schema.type === "record" && schema._type) {
-				properties[key].type = "object";
-				properties[key].additionalProperties = transformSchema(schema._type);
-			} else if (schema.type === "union" && Array.isArray(schema._union)) properties[key].type = schema._union.map((s) => _mapJsonSchemaType[s.type] ?? s.type);
-		});
-		if (!require_common_data_is.isEmpty(properties)) return {
-			type,
-			properties,
-			additionalProperties: false,
-			...required.length > 0 ? { required } : {}
-		};
-		return { type };
+		for (const key of Object.keys(schema._object)) {
+			const propSchema = schema._object[key];
+			properties[key] = transformSchema(propSchema);
+			if (propSchema._optional !== true) required.push(key);
+		}
+		if (!require_common_data_is.isEmpty(properties)) out.properties = properties;
+		out.additionalProperties = false;
+		if (required.length > 0) out.required = required;
+	} else if (schema.type === "record" && schema._type) {
+		out.type = "object";
+		out.additionalProperties = transformSchema(schema._type);
+	} else if (schema.type === "array" && schema._type) {
+		out.type = "array";
+		out.items = transformSchema(schema._type);
+	} else if (schema.type === "tuple" && Array.isArray(schema._type)) {
+		out.type = "array";
+		out.items = schema._type.map((s) => transformSchema(s));
+		out.minItems = schema._type.length;
+		out.maxItems = schema._type.length;
+	} else if (schema.type === "none") out.type = "null";
+	else if (schema.type === "any") {} else {
+		const t = _primitiveMap[schema.type];
+		if (t) out.type = t;
 	}
+	if (schema._default !== void 0 && schema.type !== "literal") out.default = schema._default;
+	if (schema._meta?.desc) out.description = schema._meta.desc;
+	return out;
+}
+function schemaExportJsonSchema(schema) {
 	return {
 		$schema: "http://json-schema.org/draft-07/schema#",
-		additionalProperties: false,
 		...transformSchema(schema)
 	};
 }

package/dist/common/schema/export-json-schema.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"export-json-schema.cjs","names":["isEmpty"],"sources":["../../../src/common/schema/export-json-schema.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { isEmpty } from '../data'\nimport { objectMap } from '../data/object'\n\nconst _mapJsonSchemaType: Record<string, string> = {\n  string: 'string',\n  number: 'number',\n  boolean: 'boolean',\n  int: 'integer',\n}\n\nexport function schemaExportJsonSchema<T>(schema: Type<T>): Record<string, any> {\n  // assert(isSchemaObjectFlat(schema), 'schema should be a flat object')\n\n  function transformSchema(schema: Type<any>): any {\n    const type = _mapJsonSchemaType[schema.type] ?? schema.type ?? 'object'\n    const properties: Record<string, any> = {}\n    const required: string[] = []\n\n    objectMap(schema._object!, (key, schema: any) => {\n      const type = _mapJsonSchemaType[schema.type] ?? schema.type\n      properties[key] = { type }\n      const enumValues = (schema as any)._enumValues\n      if (enumValues) {\n        properties[key].enum = enumValues\n      }\n      if (schema._default !== undefined) {\n        properties[key].default = schema._default\n      }\n      if (schema._meta?.desc) {\n        properties[key].description = schema._meta.desc\n      }\n      if (schema._optional !== true) {\n        required.push(key)\n      }\n      if (schema.type === 'array' && schema._type) {\n        properties[key].items = transformSchema(schema._type)\n      }\n      else if (schema.type === 'object' && schema._object) {\n        Object.assign(properties[key], transformSchema(schema))\n        properties[key].additionalProperties = false\n      }\n      else if (schema.type === 'record' && schema._type) {\n        properties[key].type = 'object'\n        properties[key].additionalProperties = transformSchema(schema._type)\n      }\n      // Handle union types (e.g., z.union)\n      else if (schema.type === 'union' && Array.isArray(schema._union)) {\n        properties[key].type = schema._union.map((s: any) => _mapJsonSchemaType[s.type] ?? s.type) // todo complex types\n      }\n    })\n\n    if (!isEmpty(properties)) {\n      return {\n        type,\n        properties,\n        additionalProperties: false,\n        ...(required.length > 0 ? { required } : {}),\n      }\n    }\n\n    return {\n      type,\n    }\n  }\n\n  return {\n    $schema: 'http://json-schema.org/draft-07/schema#',\n    additionalProperties: false,\n    ...transformSchema(schema),\n  }\n}\n\nexport function schemaExportJsonSchemaString<T>(schema: Type<T>): string {\n  const jsonSchema = schemaExportJsonSchema(schema)\n  return JSON.stringify(jsonSchema, null, 2)\n}\n"],"mappings":";;;;;AAIA,MAAM,qBAA6C;CACjD,QAAQ;CACR,QAAQ;CACR,SAAS;CACT,KAAK;CACN;AAED,SAAgB,uBAA0B,QAAsC;CAG9E,SAAS,gBAAgB,QAAwB;EAC/C,MAAM,OAAO,mBAAmB,OAAO,SAAS,OAAO,QAAQ;EAC/D,MAAM,aAAkC,EAAE;EAC1C,MAAM,WAAqB,EAAE;AAE7B,uCAAU,OAAO,UAAW,KAAK,WAAgB;AAE/C,cAAW,OAAO,EAAE,MADP,mBAAmB,OAAO,SAAS,OAAO,MAC7B;GAC1B,MAAM,aAAc,OAAe;AACnC,OAAI,WACF,YAAW,KAAK,OAAO;AAEzB,OAAI,OAAO,aAAa,OACtB,YAAW,KAAK,UAAU,OAAO;AAEnC,OAAI,OAAO,OAAO,KAChB,YAAW,KAAK,cAAc,OAAO,MAAM;AAE7C,OAAI,OAAO,cAAc,KACvB,UAAS,KAAK,IAAI;AAEpB,OAAI,OAAO,SAAS,WAAW,OAAO,MACpC,YAAW,KAAK,QAAQ,gBAAgB,OAAO,MAAM;YAE9C,OAAO,SAAS,YAAY,OAAO,SAAS;AACnD,WAAO,OAAO,WAAW,MAAM,gBAAgB,OAAO,CAAC;AACvD,eAAW,KAAK,uBAAuB;cAEhC,OAAO,SAAS,YAAY,OAAO,OAAO;AACjD,eAAW,KAAK,OAAO;AACvB,eAAW,KAAK,uBAAuB,gBAAgB,OAAO,MAAM;cAG7D,OAAO,SAAS,WAAW,MAAM,QAAQ,OAAO,OAAO,CAC9D,YAAW,KAAK,OAAO,OAAO,OAAO,KAAK,MAAW,mBAAmB,EAAE,SAAS,EAAE,KAAK;IAE5F;AAEF,MAAI,CAACA,+BAAQ,WAAW,CACtB,QAAO;GACL;GACA;GACA,sBAAsB;GACtB,GAAI,SAAS,SAAS,IAAI,EAAE,UAAU,GAAG,EAAE;GAC5C;AAGH,SAAO,EACL,MACD;;AAGH,QAAO;EACL,SAAS;EACT,sBAAsB;EACtB,GAAG,gBAAgB,OAAO;EAC3B;;AAGH,SAAgB,6BAAgC,QAAyB;CACvE,MAAM,aAAa,uBAAuB,OAAO;AACjD,QAAO,KAAK,UAAU,YAAY,MAAM,EAAE"}
+{"version":3,"file":"export-json-schema.cjs","names":["isEmpty"],"sources":["../../../src/common/schema/export-json-schema.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { isEmpty } from '../data'\n\nconst _primitiveMap: Record<string, string> = {\n  string: 'string',\n  number: 'number',\n  int: 'integer',\n  boolean: 'boolean',\n}\n\nfunction transformSchema(schema: Type<any>): Record<string, any> {\n  const out: Record<string, any> = {}\n\n  if (schema._enumValues) {\n    out.type = _primitiveMap[schema.type] ?? schema.type\n    out.enum = [...schema._enumValues]\n  }\n  else if (schema.type === 'literal') {\n    out.const = schema._default\n  }\n  else if (schema.type === 'union' && Array.isArray(schema._union)) {\n    out.anyOf = schema._union.map((s: Type<any>) => transformSchema(s))\n  }\n  else if (schema.type === 'object' && schema._object) {\n    out.type = 'object'\n    const properties: Record<string, any> = {}\n    const required: string[] = []\n    for (const key of Object.keys(schema._object)) {\n      const propSchema = schema._object[key] as Type<any>\n      properties[key] = transformSchema(propSchema)\n      if (propSchema._optional !== true)\n        required.push(key)\n    }\n    if (!isEmpty(properties))\n      out.properties = properties\n    out.additionalProperties = false\n    if (required.length > 0)\n      out.required = required\n  }\n  else if (schema.type === 'record' && schema._type) {\n    out.type = 'object'\n    out.additionalProperties = transformSchema(schema._type)\n  }\n  else if (schema.type === 'array' && schema._type) {\n    out.type = 'array'\n    out.items = transformSchema(schema._type)\n  }\n  else if (schema.type === 'tuple' && Array.isArray(schema._type)) {\n    out.type = 'array'\n    out.items = (schema._type as Type<any>[]).map(s => transformSchema(s))\n    out.minItems = schema._type.length\n    out.maxItems = schema._type.length\n  }\n  else if (schema.type === 'none') {\n    out.type = 'null'\n  }\n  else if (schema.type === 'any') {\n    // no constraint\n  }\n  else {\n    const t = _primitiveMap[schema.type]\n    if (t)\n      out.type = t\n  }\n\n  if (schema._default !== undefined && schema.type !== 'literal')\n    out.default = schema._default\n  if (schema._meta?.desc)\n    out.description = schema._meta.desc\n\n  return out\n}\n\nexport function schemaExportJsonSchema<T>(schema: Type<T>): Record<string, any> {\n  return {\n    $schema: 'http://json-schema.org/draft-07/schema#',\n    ...transformSchema(schema),\n  }\n}\n\nexport function schemaExportJsonSchemaString<T>(schema: Type<T>): string {\n  const jsonSchema = schemaExportJsonSchema(schema)\n  return JSON.stringify(jsonSchema, null, 2)\n}\n"],"mappings":";;;;AAGA,MAAM,gBAAwC;CAC5C,QAAQ;CACR,QAAQ;CACR,KAAK;CACL,SAAS;CACV;AAED,SAAS,gBAAgB,QAAwC;CAC/D,MAAM,MAA2B,EAAE;AAEnC,KAAI,OAAO,aAAa;AACtB,MAAI,OAAO,cAAc,OAAO,SAAS,OAAO;AAChD,MAAI,OAAO,CAAC,GAAG,OAAO,YAAY;YAE3B,OAAO,SAAS,UACvB,KAAI,QAAQ,OAAO;UAEZ,OAAO,SAAS,WAAW,MAAM,QAAQ,OAAO,OAAO,CAC9D,KAAI,QAAQ,OAAO,OAAO,KAAK,MAAiB,gBAAgB,EAAE,CAAC;UAE5D,OAAO,SAAS,YAAY,OAAO,SAAS;AACnD,MAAI,OAAO;EACX,MAAM,aAAkC,EAAE;EAC1C,MAAM,WAAqB,EAAE;AAC7B,OAAK,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ,EAAE;GAC7C,MAAM,aAAa,OAAO,QAAQ;AAClC,cAAW,OAAO,gBAAgB,WAAW;AAC7C,OAAI,WAAW,cAAc,KAC3B,UAAS,KAAK,IAAI;;AAEtB,MAAI,CAACA,+BAAQ,WAAW,CACtB,KAAI,aAAa;AACnB,MAAI,uBAAuB;AAC3B,MAAI,SAAS,SAAS,EACpB,KAAI,WAAW;YAEV,OAAO,SAAS,YAAY,OAAO,OAAO;AACjD,MAAI,OAAO;AACX,MAAI,uBAAuB,gBAAgB,OAAO,MAAM;YAEjD,OAAO,SAAS,WAAW,OAAO,OAAO;AAChD,MAAI,OAAO;AACX,MAAI,QAAQ,gBAAgB,OAAO,MAAM;YAElC,OAAO,SAAS,WAAW,MAAM,QAAQ,OAAO,MAAM,EAAE;AAC/D,MAAI,OAAO;AACX,MAAI,QAAS,OAAO,MAAsB,KAAI,MAAK,gBAAgB,EAAE,CAAC;AACtE,MAAI,WAAW,OAAO,MAAM;AAC5B,MAAI,WAAW,OAAO,MAAM;YAErB,OAAO,SAAS,OACvB,KAAI,OAAO;UAEJ,OAAO,SAAS,OAAO,QAG3B;EACH,MAAM,IAAI,cAAc,OAAO;AAC/B,MAAI,EACF,KAAI,OAAO;;AAGf,KAAI,OAAO,aAAa,UAAa,OAAO,SAAS,UACnD,KAAI,UAAU,OAAO;AACvB,KAAI,OAAO,OAAO,KAChB,KAAI,cAAc,OAAO,MAAM;AAEjC,QAAO;;AAGT,SAAgB,uBAA0B,QAAsC;AAC9E,QAAO;EACL,SAAS;EACT,GAAG,gBAAgB,OAAO;EAC3B;;AAGH,SAAgB,6BAAgC,QAAyB;CACvE,MAAM,aAAa,uBAAuB,OAAO;AACjD,QAAO,KAAK,UAAU,YAAY,MAAM,EAAE"}

package/dist/common/schema/export-json-schema.mjs

@@ -1,45 +1,54 @@
 import { isEmpty } from "../data/is.mjs";
-import { objectMap } from "../data/object.mjs";
 
 //#region src/common/schema/export-json-schema.ts
-const _mapJsonSchemaType = {
+const _primitiveMap = {
 	string: "string",
 	number: "number",
-	boolean: "boolean",
-	int: "integer"
+	int: "integer",
+	boolean: "boolean"
 };
-function schemaExportJsonSchema(schema) {
-	function transformSchema(schema) {
-		const type = _mapJsonSchemaType[schema.type] ?? schema.type ?? "object";
+function transformSchema(schema) {
+	const out = {};
+	if (schema._enumValues) {
+		out.type = _primitiveMap[schema.type] ?? schema.type;
+		out.enum = [...schema._enumValues];
+	} else if (schema.type === "literal") out.const = schema._default;
+	else if (schema.type === "union" && Array.isArray(schema._union)) out.anyOf = schema._union.map((s) => transformSchema(s));
+	else if (schema.type === "object" && schema._object) {
+		out.type = "object";
 		const properties = {};
 		const required = [];
-		objectMap(schema._object, (key, schema) => {
-			properties[key] = { type: _mapJsonSchemaType[schema.type] ?? schema.type };
-			const enumValues = schema._enumValues;
-			if (enumValues) properties[key].enum = enumValues;
-			if (schema._default !== void 0) properties[key].default = schema._default;
-			if (schema._meta?.desc) properties[key].description = schema._meta.desc;
-			if (schema._optional !== true) required.push(key);
-			if (schema.type === "array" && schema._type) properties[key].items = transformSchema(schema._type);
-			else if (schema.type === "object" && schema._object) {
-				Object.assign(properties[key], transformSchema(schema));
-				properties[key].additionalProperties = false;
-			} else if (schema.type === "record" && schema._type) {
-				properties[key].type = "object";
-				properties[key].additionalProperties = transformSchema(schema._type);
-			} else if (schema.type === "union" && Array.isArray(schema._union)) properties[key].type = schema._union.map((s) => _mapJsonSchemaType[s.type] ?? s.type);
-		});
-		if (!isEmpty(properties)) return {
-			type,
-			properties,
-			additionalProperties: false,
-			...required.length > 0 ? { required } : {}
-		};
-		return { type };
+		for (const key of Object.keys(schema._object)) {
+			const propSchema = schema._object[key];
+			properties[key] = transformSchema(propSchema);
+			if (propSchema._optional !== true) required.push(key);
+		}
+		if (!isEmpty(properties)) out.properties = properties;
+		out.additionalProperties = false;
+		if (required.length > 0) out.required = required;
+	} else if (schema.type === "record" && schema._type) {
+		out.type = "object";
+		out.additionalProperties = transformSchema(schema._type);
+	} else if (schema.type === "array" && schema._type) {
+		out.type = "array";
+		out.items = transformSchema(schema._type);
+	} else if (schema.type === "tuple" && Array.isArray(schema._type)) {
+		out.type = "array";
+		out.items = schema._type.map((s) => transformSchema(s));
+		out.minItems = schema._type.length;
+		out.maxItems = schema._type.length;
+	} else if (schema.type === "none") out.type = "null";
+	else if (schema.type === "any") {} else {
+		const t = _primitiveMap[schema.type];
+		if (t) out.type = t;
 	}
+	if (schema._default !== void 0 && schema.type !== "literal") out.default = schema._default;
+	if (schema._meta?.desc) out.description = schema._meta.desc;
+	return out;
+}
+function schemaExportJsonSchema(schema) {
 	return {
 		$schema: "http://json-schema.org/draft-07/schema#",
-		additionalProperties: false,
 		...transformSchema(schema)
 	};
 }

package/dist/common/schema/export-json-schema.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"export-json-schema.mjs","names":[],"sources":["../../../src/common/schema/export-json-schema.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { isEmpty } from '../data'\nimport { objectMap } from '../data/object'\n\nconst _mapJsonSchemaType: Record<string, string> = {\n  string: 'string',\n  number: 'number',\n  boolean: 'boolean',\n  int: 'integer',\n}\n\nexport function schemaExportJsonSchema<T>(schema: Type<T>): Record<string, any> {\n  // assert(isSchemaObjectFlat(schema), 'schema should be a flat object')\n\n  function transformSchema(schema: Type<any>): any {\n    const type = _mapJsonSchemaType[schema.type] ?? schema.type ?? 'object'\n    const properties: Record<string, any> = {}\n    const required: string[] = []\n\n    objectMap(schema._object!, (key, schema: any) => {\n      const type = _mapJsonSchemaType[schema.type] ?? schema.type\n      properties[key] = { type }\n      const enumValues = (schema as any)._enumValues\n      if (enumValues) {\n        properties[key].enum = enumValues\n      }\n      if (schema._default !== undefined) {\n        properties[key].default = schema._default\n      }\n      if (schema._meta?.desc) {\n        properties[key].description = schema._meta.desc\n      }\n      if (schema._optional !== true) {\n        required.push(key)\n      }\n      if (schema.type === 'array' && schema._type) {\n        properties[key].items = transformSchema(schema._type)\n      }\n      else if (schema.type === 'object' && schema._object) {\n        Object.assign(properties[key], transformSchema(schema))\n        properties[key].additionalProperties = false\n      }\n      else if (schema.type === 'record' && schema._type) {\n        properties[key].type = 'object'\n        properties[key].additionalProperties = transformSchema(schema._type)\n      }\n      // Handle union types (e.g., z.union)\n      else if (schema.type === 'union' && Array.isArray(schema._union)) {\n        properties[key].type = schema._union.map((s: any) => _mapJsonSchemaType[s.type] ?? s.type) // todo complex types\n      }\n    })\n\n    if (!isEmpty(properties)) {\n      return {\n        type,\n        properties,\n        additionalProperties: false,\n        ...(required.length > 0 ? { required } : {}),\n      }\n    }\n\n    return {\n      type,\n    }\n  }\n\n  return {\n    $schema: 'http://json-schema.org/draft-07/schema#',\n    additionalProperties: false,\n    ...transformSchema(schema),\n  }\n}\n\nexport function schemaExportJsonSchemaString<T>(schema: Type<T>): string {\n  const jsonSchema = schemaExportJsonSchema(schema)\n  return JSON.stringify(jsonSchema, null, 2)\n}\n"],"mappings":";;;;AAIA,MAAM,qBAA6C;CACjD,QAAQ;CACR,QAAQ;CACR,SAAS;CACT,KAAK;CACN;AAED,SAAgB,uBAA0B,QAAsC;CAG9E,SAAS,gBAAgB,QAAwB;EAC/C,MAAM,OAAO,mBAAmB,OAAO,SAAS,OAAO,QAAQ;EAC/D,MAAM,aAAkC,EAAE;EAC1C,MAAM,WAAqB,EAAE;AAE7B,YAAU,OAAO,UAAW,KAAK,WAAgB;AAE/C,cAAW,OAAO,EAAE,MADP,mBAAmB,OAAO,SAAS,OAAO,MAC7B;GAC1B,MAAM,aAAc,OAAe;AACnC,OAAI,WACF,YAAW,KAAK,OAAO;AAEzB,OAAI,OAAO,aAAa,OACtB,YAAW,KAAK,UAAU,OAAO;AAEnC,OAAI,OAAO,OAAO,KAChB,YAAW,KAAK,cAAc,OAAO,MAAM;AAE7C,OAAI,OAAO,cAAc,KACvB,UAAS,KAAK,IAAI;AAEpB,OAAI,OAAO,SAAS,WAAW,OAAO,MACpC,YAAW,KAAK,QAAQ,gBAAgB,OAAO,MAAM;YAE9C,OAAO,SAAS,YAAY,OAAO,SAAS;AACnD,WAAO,OAAO,WAAW,MAAM,gBAAgB,OAAO,CAAC;AACvD,eAAW,KAAK,uBAAuB;cAEhC,OAAO,SAAS,YAAY,OAAO,OAAO;AACjD,eAAW,KAAK,OAAO;AACvB,eAAW,KAAK,uBAAuB,gBAAgB,OAAO,MAAM;cAG7D,OAAO,SAAS,WAAW,MAAM,QAAQ,OAAO,OAAO,CAC9D,YAAW,KAAK,OAAO,OAAO,OAAO,KAAK,MAAW,mBAAmB,EAAE,SAAS,EAAE,KAAK;IAE5F;AAEF,MAAI,CAAC,QAAQ,WAAW,CACtB,QAAO;GACL;GACA;GACA,sBAAsB;GACtB,GAAI,SAAS,SAAS,IAAI,EAAE,UAAU,GAAG,EAAE;GAC5C;AAGH,SAAO,EACL,MACD;;AAGH,QAAO;EACL,SAAS;EACT,sBAAsB;EACtB,GAAG,gBAAgB,OAAO;EAC3B;;AAGH,SAAgB,6BAAgC,QAAyB;CACvE,MAAM,aAAa,uBAAuB,OAAO;AACjD,QAAO,KAAK,UAAU,YAAY,MAAM,EAAE"}
+{"version":3,"file":"export-json-schema.mjs","names":[],"sources":["../../../src/common/schema/export-json-schema.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { isEmpty } from '../data'\n\nconst _primitiveMap: Record<string, string> = {\n  string: 'string',\n  number: 'number',\n  int: 'integer',\n  boolean: 'boolean',\n}\n\nfunction transformSchema(schema: Type<any>): Record<string, any> {\n  const out: Record<string, any> = {}\n\n  if (schema._enumValues) {\n    out.type = _primitiveMap[schema.type] ?? schema.type\n    out.enum = [...schema._enumValues]\n  }\n  else if (schema.type === 'literal') {\n    out.const = schema._default\n  }\n  else if (schema.type === 'union' && Array.isArray(schema._union)) {\n    out.anyOf = schema._union.map((s: Type<any>) => transformSchema(s))\n  }\n  else if (schema.type === 'object' && schema._object) {\n    out.type = 'object'\n    const properties: Record<string, any> = {}\n    const required: string[] = []\n    for (const key of Object.keys(schema._object)) {\n      const propSchema = schema._object[key] as Type<any>\n      properties[key] = transformSchema(propSchema)\n      if (propSchema._optional !== true)\n        required.push(key)\n    }\n    if (!isEmpty(properties))\n      out.properties = properties\n    out.additionalProperties = false\n    if (required.length > 0)\n      out.required = required\n  }\n  else if (schema.type === 'record' && schema._type) {\n    out.type = 'object'\n    out.additionalProperties = transformSchema(schema._type)\n  }\n  else if (schema.type === 'array' && schema._type) {\n    out.type = 'array'\n    out.items = transformSchema(schema._type)\n  }\n  else if (schema.type === 'tuple' && Array.isArray(schema._type)) {\n    out.type = 'array'\n    out.items = (schema._type as Type<any>[]).map(s => transformSchema(s))\n    out.minItems = schema._type.length\n    out.maxItems = schema._type.length\n  }\n  else if (schema.type === 'none') {\n    out.type = 'null'\n  }\n  else if (schema.type === 'any') {\n    // no constraint\n  }\n  else {\n    const t = _primitiveMap[schema.type]\n    if (t)\n      out.type = t\n  }\n\n  if (schema._default !== undefined && schema.type !== 'literal')\n    out.default = schema._default\n  if (schema._meta?.desc)\n    out.description = schema._meta.desc\n\n  return out\n}\n\nexport function schemaExportJsonSchema<T>(schema: Type<T>): Record<string, any> {\n  return {\n    $schema: 'http://json-schema.org/draft-07/schema#',\n    ...transformSchema(schema),\n  }\n}\n\nexport function schemaExportJsonSchemaString<T>(schema: Type<T>): string {\n  const jsonSchema = schemaExportJsonSchema(schema)\n  return JSON.stringify(jsonSchema, null, 2)\n}\n"],"mappings":";;;AAGA,MAAM,gBAAwC;CAC5C,QAAQ;CACR,QAAQ;CACR,KAAK;CACL,SAAS;CACV;AAED,SAAS,gBAAgB,QAAwC;CAC/D,MAAM,MAA2B,EAAE;AAEnC,KAAI,OAAO,aAAa;AACtB,MAAI,OAAO,cAAc,OAAO,SAAS,OAAO;AAChD,MAAI,OAAO,CAAC,GAAG,OAAO,YAAY;YAE3B,OAAO,SAAS,UACvB,KAAI,QAAQ,OAAO;UAEZ,OAAO,SAAS,WAAW,MAAM,QAAQ,OAAO,OAAO,CAC9D,KAAI,QAAQ,OAAO,OAAO,KAAK,MAAiB,gBAAgB,EAAE,CAAC;UAE5D,OAAO,SAAS,YAAY,OAAO,SAAS;AACnD,MAAI,OAAO;EACX,MAAM,aAAkC,EAAE;EAC1C,MAAM,WAAqB,EAAE;AAC7B,OAAK,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ,EAAE;GAC7C,MAAM,aAAa,OAAO,QAAQ;AAClC,cAAW,OAAO,gBAAgB,WAAW;AAC7C,OAAI,WAAW,cAAc,KAC3B,UAAS,KAAK,IAAI;;AAEtB,MAAI,CAAC,QAAQ,WAAW,CACtB,KAAI,aAAa;AACnB,MAAI,uBAAuB;AAC3B,MAAI,SAAS,SAAS,EACpB,KAAI,WAAW;YAEV,OAAO,SAAS,YAAY,OAAO,OAAO;AACjD,MAAI,OAAO;AACX,MAAI,uBAAuB,gBAAgB,OAAO,MAAM;YAEjD,OAAO,SAAS,WAAW,OAAO,OAAO;AAChD,MAAI,OAAO;AACX,MAAI,QAAQ,gBAAgB,OAAO,MAAM;YAElC,OAAO,SAAS,WAAW,MAAM,QAAQ,OAAO,MAAM,EAAE;AAC/D,MAAI,OAAO;AACX,MAAI,QAAS,OAAO,MAAsB,KAAI,MAAK,gBAAgB,EAAE,CAAC;AACtE,MAAI,WAAW,OAAO,MAAM;AAC5B,MAAI,WAAW,OAAO,MAAM;YAErB,OAAO,SAAS,OACvB,KAAI,OAAO;UAEJ,OAAO,SAAS,OAAO,QAG3B;EACH,MAAM,IAAI,cAAc,OAAO;AAC/B,MAAI,EACF,KAAI,OAAO;;AAGf,KAAI,OAAO,aAAa,UAAa,OAAO,SAAS,UACnD,KAAI,UAAU,OAAO;AACvB,KAAI,OAAO,OAAO,KAChB,KAAI,cAAc,OAAO,MAAM;AAEjC,QAAO;;AAGT,SAAgB,uBAA0B,QAAsC;AAC9E,QAAO;EACL,SAAS;EACT,GAAG,gBAAgB,OAAO;EAC3B;;AAGH,SAAgB,6BAAgC,QAAyB;CACvE,MAAM,aAAa,uBAAuB,OAAO;AACjD,QAAO,KAAK,UAAU,YAAY,MAAM,EAAE"}

package/dist/common/schema/index.cjs

@@ -8,27 +8,44 @@ const require_common_schema_parse_args = require('./parse-args.cjs');
 const require_common_schema_parse_env = require('./parse-env.cjs');
 const require_common_schema_schema = require('./schema.cjs');
 const require_common_schema_serialize = require('./serialize.cjs');
+const require_common_schema_sql_table = require('./sql/table.cjs');
+const require_common_schema_sql_expr = require('./sql/expr.cjs');
+const require_common_schema_sql_select = require('./sql/select.cjs');
 const require_common_schema_z_collection = require('./z-collection.cjs');
 
+exports.SelectBuilder = require_common_schema_sql_select.SelectBuilder;
 exports.Type = require_common_schema_schema.Type;
+exports.and = require_common_schema_sql_expr.and;
 exports.any = require_common_schema_schema.any;
 exports.array = require_common_schema_schema.array;
 exports.boolean = require_common_schema_schema.boolean;
 exports.deserializeSchema = require_common_schema_serialize.deserializeSchema;
 exports.double = require_common_schema_schema.double;
+exports.eq = require_common_schema_sql_expr.eq;
 exports.float = require_common_schema_schema.float;
+exports.from = require_common_schema_sql_select.from;
 exports.func = require_common_schema_schema.func;
+exports.gt = require_common_schema_sql_expr.gt;
+exports.gte = require_common_schema_sql_expr.gte;
 exports.helpSchemaArgs = require_common_schema_parse_args.helpSchemaArgs;
+exports.inArray = require_common_schema_sql_expr.inArray;
 exports.int = require_common_schema_schema.int;
+exports.isColumn = require_common_schema_sql_table.isColumn;
 exports.isSchemaDefault = require_common_schema_utils.isSchemaDefault;
 exports.isSchemaObject = require_common_schema_utils.isSchemaObject;
 exports.isSchemaObjectFlat = require_common_schema_utils.isSchemaObjectFlat;
 exports.isSchemaOptional = require_common_schema_utils.isSchemaOptional;
 exports.isSchemaPrimitive = require_common_schema_utils.isSchemaPrimitive;
+exports.like = require_common_schema_sql_expr.like;
 exports.literal = require_common_schema_schema.literal;
+exports.lt = require_common_schema_sql_expr.lt;
+exports.lte = require_common_schema_sql_expr.lte;
+exports.ne = require_common_schema_sql_expr.ne;
 exports.none = require_common_schema_schema.none;
+exports.not = require_common_schema_sql_expr.not;
 exports.number = require_common_schema_schema.number;
 exports.object = require_common_schema_schema.object;
+exports.or = require_common_schema_sql_expr.or;
 exports.parseSchemaArgs = require_common_schema_parse_args.parseSchemaArgs;
 exports.parseSchemaEnv = require_common_schema_parse_env.parseSchemaEnv;
 exports.real = require_common_schema_schema.real;
@@ -41,10 +58,14 @@ exports.schemaExportSwiftStruct = require_common_schema_export_swift.schemaExpor
 exports.schemaExportTypescriptInterface = require_common_schema_export_typescript.schemaExportTypescriptInterface;
 exports.schemaParseObject = require_common_schema_parse_object.schemaParseObject;
 exports.schemaValidateObject = require_common_schema_parse_object.schemaValidateObject;
+exports.select = require_common_schema_sql_select.select;
 exports.serializeSchema = require_common_schema_serialize.serializeSchema;
+exports.sqlIsNotNull = require_common_schema_sql_expr.sqlIsNotNull;
+exports.sqlIsNull = require_common_schema_sql_expr.sqlIsNull;
 exports.string = require_common_schema_schema.string;
 exports.stringFromSchemaEnv = require_common_schema_parse_env.stringFromSchemaEnv;
 exports.stringLiterals = require_common_schema_schema.stringLiterals;
+exports.table = require_common_schema_sql_table.table;
 exports.tuple = require_common_schema_schema.tuple;
 exports.union = require_common_schema_schema.union;
 Object.defineProperty(exports, 'z', {

package/dist/common/schema/index.d.cts

@@ -8,6 +8,9 @@ import { i as stringFromSchemaEnv, n as SchemaEnvType, r as parseSchemaEnv, t as
 import { i as schemaValidateObject, n as schemaCreateObject, r as schemaParseObject, t as SchemaValidateMessage } from "../../parse-object-D_fCDXxd.cjs";
 import { t as StandardSchemaV1 } from "../../schema-standard-BxRHxZeM.cjs";
 import { n as deserializeSchema, r as serializeSchema, t as SerializedType } from "../../serialize-9GhlcFMv.cjs";
-import { n as IsEqual, t as Expect } from "../../type-test-sM7QpfQU.cjs";
-import { a as isSchemaPrimitive, i as isSchemaOptional, n as isSchemaObject, r as isSchemaObjectFlat, t as isSchemaDefault } from "../../utils-Bctk_WhH.cjs";
-export { Expect, Infer, IsEqual, SchemaEnvOptions, SchemaEnvType, SchemaValidateMessage, SerializedType, StandardSchemaV1, Type, TypeArray, TypeArrayOutput, TypeLiterals, TypeMeta, TypeObjectFixOptional, TypeTuple, TypeUnion, any, array, boolean, deserializeSchema, double, float, func, helpSchemaArgs, int, isSchemaDefault, isSchemaObject, isSchemaObjectFlat, isSchemaOptional, isSchemaPrimitive, literal, none, number, object, parseSchemaArgs, parseSchemaEnv, real, record, rpc, schemaCreateObject, schemaExportJsonSchema, schemaExportJsonSchemaString, schemaExportSwiftStruct, schemaExportTypescriptInterface, schemaParseObject, schemaValidateObject, serializeSchema, string, stringFromSchemaEnv, stringLiterals, tuple, union, z_collection_d_exports as z };
+import { a as table, i as isColumn, n as TableColumns, r as TableShape, t as Column } from "../../table-IkLXirT-.cjs";
+import { a as gte, c as lt, d as not, f as or, i as gt, l as lte, m as sqlIsNull, n as and, o as inArray, p as sqlIsNotNull, r as eq, s as like, t as Expr, u as ne } from "../../expr-yYgSeBZ3.cjs";
+import { a as RowFromTable, c as select, i as RowFromSelection, n as InferRow, o as SelectBuilder, r as QueryDependencies, s as from, t as CompiledQuery } from "../../select-DrciHdk_.cjs";
+import { n as IsEqual, t as Expect } from "../../type-test-CBK-iJ9d.cjs";
+import { a as isSchemaPrimitive, i as isSchemaOptional, n as isSchemaObject, r as isSchemaObjectFlat, t as isSchemaDefault } from "../../utils-nCQklGHV.cjs";
+export { Column, CompiledQuery, Expect, Expr, Infer, InferRow, IsEqual, QueryDependencies, RowFromSelection, RowFromTable, SchemaEnvOptions, SchemaEnvType, SchemaValidateMessage, SelectBuilder, SerializedType, StandardSchemaV1, TableColumns, TableShape, Type, TypeArray, TypeArrayOutput, TypeLiterals, TypeMeta, TypeObjectFixOptional, TypeTuple, TypeUnion, and, any, array, boolean, deserializeSchema, double, eq, float, from, func, gt, gte, helpSchemaArgs, inArray, int, isColumn, isSchemaDefault, isSchemaObject, isSchemaObjectFlat, isSchemaOptional, isSchemaPrimitive, like, literal, lt, lte, ne, none, not, number, object, or, parseSchemaArgs, parseSchemaEnv, real, record, rpc, schemaCreateObject, schemaExportJsonSchema, schemaExportJsonSchemaString, schemaExportSwiftStruct, schemaExportTypescriptInterface, schemaParseObject, schemaValidateObject, select, serializeSchema, sqlIsNotNull, sqlIsNull, string, stringFromSchemaEnv, stringLiterals, table, tuple, union, z_collection_d_exports as z };

package/dist/common/schema/index.d.mts

@@ -7,7 +7,10 @@ import { i as stringFromSchemaEnv, n as SchemaEnvType, r as parseSchemaEnv, t as
 import { i as schemaValidateObject, n as schemaCreateObject, r as schemaParseObject, t as SchemaValidateMessage } from "../../parse-object-BRWSD2uh.mjs";
 import { t as StandardSchemaV1 } from "../../schema-standard-Q-bdIO6s.mjs";
 import { n as deserializeSchema, r as serializeSchema, t as SerializedType } from "../../serialize-rRk9F-zH.mjs";
-import { n as IsEqual, t as Expect } from "../../type-test-BiKyEZkc.mjs";
-import { a as isSchemaPrimitive, i as isSchemaOptional, n as isSchemaObject, r as isSchemaObjectFlat, t as isSchemaDefault } from "../../utils-B8DsVgFr.mjs";
-import { t as z_collection_d_exports } from "../../z-collection-BmuBin--.mjs";
-export { Expect, Infer, IsEqual, SchemaEnvOptions, SchemaEnvType, SchemaValidateMessage, SerializedType, StandardSchemaV1, Type, TypeArray, TypeArrayOutput, TypeLiterals, TypeMeta, TypeObjectFixOptional, TypeTuple, TypeUnion, any, array, boolean, deserializeSchema, double, float, func, helpSchemaArgs, int, isSchemaDefault, isSchemaObject, isSchemaObjectFlat, isSchemaOptional, isSchemaPrimitive, literal, none, number, object, parseSchemaArgs, parseSchemaEnv, real, record, rpc, schemaCreateObject, schemaExportJsonSchema, schemaExportJsonSchemaString, schemaExportSwiftStruct, schemaExportTypescriptInterface, schemaParseObject, schemaValidateObject, serializeSchema, string, stringFromSchemaEnv, stringLiterals, tuple, union, z_collection_d_exports as z };
+import { a as table, i as isColumn, n as TableColumns, r as TableShape, t as Column } from "../../table-Cr8tjDIL.mjs";
+import { a as gte, c as lt, d as not, f as or, i as gt, l as lte, m as sqlIsNull, n as and, o as inArray, p as sqlIsNotNull, r as eq, s as like, t as Expr, u as ne } from "../../expr-CCKrqOw1.mjs";
+import { a as RowFromTable, c as select, i as RowFromSelection, n as InferRow, o as SelectBuilder, r as QueryDependencies, s as from, t as CompiledQuery } from "../../select-F2KpP6mo.mjs";
+import { n as IsEqual, t as Expect } from "../../type-test-BvzWDJz3.mjs";
+import { a as isSchemaPrimitive, i as isSchemaOptional, n as isSchemaObject, r as isSchemaObjectFlat, t as isSchemaDefault } from "../../utils-1RyCGkpQ.mjs";
+import { t as z_collection_d_exports } from "../../z-collection-BSfgRU0Q.mjs";
+export { Column, CompiledQuery, Expect, Expr, Infer, InferRow, IsEqual, QueryDependencies, RowFromSelection, RowFromTable, SchemaEnvOptions, SchemaEnvType, SchemaValidateMessage, SelectBuilder, SerializedType, StandardSchemaV1, TableColumns, TableShape, Type, TypeArray, TypeArrayOutput, TypeLiterals, TypeMeta, TypeObjectFixOptional, TypeTuple, TypeUnion, and, any, array, boolean, deserializeSchema, double, eq, float, from, func, gt, gte, helpSchemaArgs, inArray, int, isColumn, isSchemaDefault, isSchemaObject, isSchemaObjectFlat, isSchemaOptional, isSchemaPrimitive, like, literal, lt, lte, ne, none, not, number, object, or, parseSchemaArgs, parseSchemaEnv, real, record, rpc, schemaCreateObject, schemaExportJsonSchema, schemaExportJsonSchemaString, schemaExportSwiftStruct, schemaExportTypescriptInterface, schemaParseObject, schemaValidateObject, select, serializeSchema, sqlIsNotNull, sqlIsNull, string, stringFromSchemaEnv, stringLiterals, table, tuple, union, z_collection_d_exports as z };

package/dist/common/schema/index.mjs

@@ -7,6 +7,9 @@ import { helpSchemaArgs, parseSchemaArgs } from "./parse-args.mjs";
 import { parseSchemaEnv, stringFromSchemaEnv } from "./parse-env.mjs";
 import { Type, any, array, boolean, double, float, func, int, literal, none, number, object, real, record, rpc, string, stringLiterals, tuple, union } from "./schema.mjs";
 import { deserializeSchema, serializeSchema } from "./serialize.mjs";
+import { isColumn, table } from "./sql/table.mjs";
+import { and, eq, gt, gte, inArray, like, lt, lte, ne, not, or, sqlIsNotNull, sqlIsNull } from "./sql/expr.mjs";
+import { SelectBuilder, from, select } from "./sql/select.mjs";
 import { t as z_collection_exports } from "./z-collection.mjs";
 
-export { Type, any, array, boolean, deserializeSchema, double, float, func, helpSchemaArgs, int, isSchemaDefault, isSchemaObject, isSchemaObjectFlat, isSchemaOptional, isSchemaPrimitive, literal, none, number, object, parseSchemaArgs, parseSchemaEnv, real, record, rpc, schemaCreateObject, schemaExportJsonSchema, schemaExportJsonSchemaString, schemaExportSwiftStruct, schemaExportTypescriptInterface, schemaParseObject, schemaValidateObject, serializeSchema, string, stringFromSchemaEnv, stringLiterals, tuple, union, z_collection_exports as z };
+export { SelectBuilder, Type, and, any, array, boolean, deserializeSchema, double, eq, float, from, func, gt, gte, helpSchemaArgs, inArray, int, isColumn, isSchemaDefault, isSchemaObject, isSchemaObjectFlat, isSchemaOptional, isSchemaPrimitive, like, literal, lt, lte, ne, none, not, number, object, or, parseSchemaArgs, parseSchemaEnv, real, record, rpc, schemaCreateObject, schemaExportJsonSchema, schemaExportJsonSchemaString, schemaExportSwiftStruct, schemaExportTypescriptInterface, schemaParseObject, schemaValidateObject, select, serializeSchema, sqlIsNotNull, sqlIsNull, string, stringFromSchemaEnv, stringLiterals, table, tuple, union, z_collection_exports as z };

package/dist/common/schema/sql/expr.cjs

@@ -0,0 +1,128 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_common_schema_sql_table = require('./table.cjs');
+
+//#region src/common/schema/sql/expr.ts
+function operand(v) {
+	if (require_common_schema_sql_table.isColumn(v)) return {
+		kind: "expr",
+		sql: `"${v._table}"."${v._name}"`,
+		params: [],
+		refs: [v]
+	};
+	if (v && v.kind === "expr") return v;
+	return {
+		kind: "expr",
+		sql: "?",
+		params: [v],
+		refs: []
+	};
+}
+function binop(op) {
+	return (a, b) => {
+		const x = operand(a);
+		const y = operand(b);
+		return {
+			kind: "expr",
+			sql: `${x.sql} ${op} ${y.sql}`,
+			params: [...x.params, ...y.params],
+			refs: [...x.refs, ...y.refs]
+		};
+	};
+}
+const eq = binop("=");
+const ne = binop("<>");
+const gt = binop(">");
+const gte = binop(">=");
+const lt = binop("<");
+const lte = binop("<=");
+const like = binop("LIKE");
+function and(...parts) {
+	const list = parts.filter((p) => !!p);
+	if (list.length === 0) return {
+		kind: "expr",
+		sql: "1=1",
+		params: [],
+		refs: []
+	};
+	if (list.length === 1) return list[0];
+	return {
+		kind: "expr",
+		sql: list.map((p) => `(${p.sql})`).join(" AND "),
+		params: list.flatMap((p) => p.params),
+		refs: list.flatMap((p) => p.refs)
+	};
+}
+function or(...parts) {
+	const list = parts.filter((p) => !!p);
+	if (list.length === 0) return {
+		kind: "expr",
+		sql: "1=0",
+		params: [],
+		refs: []
+	};
+	if (list.length === 1) return list[0];
+	return {
+		kind: "expr",
+		sql: list.map((p) => `(${p.sql})`).join(" OR "),
+		params: list.flatMap((p) => p.params),
+		refs: list.flatMap((p) => p.refs)
+	};
+}
+function not(e) {
+	return {
+		kind: "expr",
+		sql: `NOT (${e.sql})`,
+		params: e.params,
+		refs: e.refs
+	};
+}
+function sqlIsNull(col) {
+	const x = operand(col);
+	return {
+		kind: "expr",
+		sql: `${x.sql} IS NULL`,
+		params: x.params,
+		refs: x.refs
+	};
+}
+function sqlIsNotNull(col) {
+	const x = operand(col);
+	return {
+		kind: "expr",
+		sql: `${x.sql} IS NOT NULL`,
+		params: x.params,
+		refs: x.refs
+	};
+}
+function inArray(col, values) {
+	const x = operand(col);
+	if (values.length === 0) return {
+		kind: "expr",
+		sql: "1=0",
+		params: [],
+		refs: x.refs
+	};
+	const placeholders = values.map(() => "?").join(", ");
+	return {
+		kind: "expr",
+		sql: `${x.sql} IN (${placeholders})`,
+		params: [...x.params, ...values],
+		refs: x.refs
+	};
+}
+
+//#endregion
+exports.and = and;
+exports.eq = eq;
+exports.gt = gt;
+exports.gte = gte;
+exports.inArray = inArray;
+exports.like = like;
+exports.lt = lt;
+exports.lte = lte;
+exports.ne = ne;
+exports.not = not;
+exports.or = or;
+exports.sqlIsNotNull = sqlIsNotNull;
+exports.sqlIsNull = sqlIsNull;
+//# sourceMappingURL=expr.cjs.map

package/dist/common/schema/sql/expr.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"expr.cjs","names":["isColumn"],"sources":["../../../../src/common/schema/sql/expr.ts"],"sourcesContent":["import type { Column } from './table'\nimport { isColumn } from './table'\n\nexport interface Expr {\n  readonly kind: 'expr'\n  readonly sql: string\n  readonly params: unknown[]\n  readonly refs: Column[]\n}\n\nfunction operand(v: any): Expr {\n  if (isColumn(v)) {\n    return {\n      kind: 'expr',\n      sql: `\"${v._table}\".\"${v._name}\"`,\n      params: [],\n      refs: [v],\n    }\n  }\n  if (v && v.kind === 'expr')\n    return v as Expr\n  return { kind: 'expr', sql: '?', params: [v], refs: [] }\n}\n\nfunction binop(op: string) {\n  return (a: Column | Expr | unknown, b: Column | Expr | unknown): Expr => {\n    const x = operand(a)\n    const y = operand(b)\n    return {\n      kind: 'expr',\n      sql: `${x.sql} ${op} ${y.sql}`,\n      params: [...x.params, ...y.params],\n      refs: [...x.refs, ...y.refs],\n    }\n  }\n}\n\nexport const eq = binop('=')\nexport const ne = binop('<>')\nexport const gt = binop('>')\nexport const gte = binop('>=')\nexport const lt = binop('<')\nexport const lte = binop('<=')\nexport const like = binop('LIKE')\n\nexport function and(...parts: (Expr | undefined | false | null)[]): Expr {\n  const list = parts.filter((p): p is Expr => !!p)\n  if (list.length === 0)\n    return { kind: 'expr', sql: '1=1', params: [], refs: [] }\n  if (list.length === 1)\n    return list[0]\n  return {\n    kind: 'expr',\n    sql: list.map(p => `(${p.sql})`).join(' AND '),\n    params: list.flatMap(p => p.params),\n    refs: list.flatMap(p => p.refs),\n  }\n}\n\nexport function or(...parts: (Expr | undefined | false | null)[]): Expr {\n  const list = parts.filter((p): p is Expr => !!p)\n  if (list.length === 0)\n    return { kind: 'expr', sql: '1=0', params: [], refs: [] }\n  if (list.length === 1)\n    return list[0]\n  return {\n    kind: 'expr',\n    sql: list.map(p => `(${p.sql})`).join(' OR '),\n    params: list.flatMap(p => p.params),\n    refs: list.flatMap(p => p.refs),\n  }\n}\n\nexport function not(e: Expr): Expr {\n  return { kind: 'expr', sql: `NOT (${e.sql})`, params: e.params, refs: e.refs }\n}\n\nexport function sqlIsNull(col: Column | Expr): Expr {\n  const x = operand(col)\n  return { kind: 'expr', sql: `${x.sql} IS NULL`, params: x.params, refs: x.refs }\n}\n\nexport function sqlIsNotNull(col: Column | Expr): Expr {\n  const x = operand(col)\n  return { kind: 'expr', sql: `${x.sql} IS NOT NULL`, params: x.params, refs: x.refs }\n}\n\nexport function inArray(col: Column | Expr, values: unknown[]): Expr {\n  const x = operand(col)\n  if (values.length === 0)\n    return { kind: 'expr', sql: '1=0', params: [], refs: x.refs }\n  const placeholders = values.map(() => '?').join(', ')\n  return {\n    kind: 'expr',\n    sql: `${x.sql} IN (${placeholders})`,\n    params: [...x.params, ...values],\n    refs: x.refs,\n  }\n}\n"],"mappings":"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"}

package/dist/common/schema/sql/expr.d.cts

@@ -0,0 +1,2 @@
+import { a as gte, c as lt, d as not, f as or, i as gt, l as lte, m as sqlIsNull, n as and, o as inArray, p as sqlIsNotNull, r as eq, s as like, t as Expr, u as ne } from "../../../expr-yYgSeBZ3.cjs";
+export { Expr, and, eq, gt, gte, inArray, like, lt, lte, ne, not, or, sqlIsNotNull, sqlIsNull };

package/dist/common/schema/sql/expr.d.mts

@@ -0,0 +1,2 @@
+import { a as gte, c as lt, d as not, f as or, i as gt, l as lte, m as sqlIsNull, n as and, o as inArray, p as sqlIsNotNull, r as eq, s as like, t as Expr, u as ne } from "../../../expr-CCKrqOw1.mjs";
+export { Expr, and, eq, gt, gte, inArray, like, lt, lte, ne, not, or, sqlIsNotNull, sqlIsNull };