@atscript/db-postgres 0.1.135 → 0.1.136

package/dist/index.cjs

@@ -78,11 +78,30 @@ const pgDialect = {
 		};
 	},
 	calendarBucket: pgCalendarBucket,
+	jsonExtract: pgJsonExtract,
 	createViewPrefix: "CREATE OR REPLACE VIEW",
 	paramPlaceholder(index) {
 		return `$${index}`;
 	}
 };
+/** Cast applied to the `#>>` text per leaf type — `jsonb_typeof()` names equal the type names. */
+const PG_JSON_LEAF_CAST = {
+	string: "",
+	number: "::double precision",
+	boolean: "::boolean"
+};
+/**
+* Typed read of a JSON leaf (`SqlDialect.jsonExtract`): `jsonb_typeof()`
+* guards the declared type, so a missing path, JSON `null` or another JSON
+* type yields NULL (no coercion). Numbers are `double precision`, booleans
+* native. The column is cast `::jsonb`, so JSON and JSONB storage both work.
+*/
+function pgJsonExtract(quotedCol, path, type) {
+	const p = (0, _atscript_db_sql_tools.sqlStringLiteral)(`{${(0, _atscript_db_sql_tools.quotedJsonPathSegments)(path).join(",")}}`);
+	const j = `(${quotedCol})::jsonb`;
+	const cast = PG_JSON_LEAF_CAST[type];
+	return `CASE jsonb_typeof(${j} #> ${p}) WHEN '${type}' THEN ${cast ? `(${j} #>> ${p})${cast}` : `${j} #>> ${p}`} END`;
+}
 /**
 * Calendar-bucket label over an epoch-ms column (BIGINT for
 * `@db.default.now`, DOUBLE PRECISION otherwise): TEXT `'YYYY-MM-DD'` — the
@@ -472,6 +491,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	calendarBucketUnits() {
 		return _atscript_db.ALL_BUCKET_UNITS;
 	}
+	/** Every aggregate function, `countDistinct` included. */
+	aggregateFns() {
+		return _atscript_db.ALL_AGGREGATE_FNS;
+	}
 	onBeforeFlatten(_type) {}
 	onAfterFlatten() {
 		for (const fd of this._table.fieldDescriptors) if (fd.collate === "nocase") this._nocaseColumns.add(fd.physicalName);

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
 import { TSqlFragment } from "@atscript/db-sql-tools";
 
@@ -118,6 +118,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * server's tz database (an unknown one maps to `BUCKET_TZ_UNAVAILABLE`).
    */
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
+  /** Every aggregate function, `countDistinct` included. */
+  aggregateFns(): ReadonlySet<AggregateFn>;
   onBeforeFlatten(_type: unknown): void;
   onAfterFlatten(): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair } from "@atscript/db";
 import { TSqlFragment } from "@atscript/db-sql-tools";
 import { TMetadataMap } from "@atscript/typescript/utils";
 
@@ -118,6 +118,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * server's tz database (an unknown one maps to `BUCKET_TZ_UNAVAILABLE`).
    */
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
+  /** Every aggregate function, `countDistinct` included. */
+  aggregateFns(): ReadonlySet<AggregateFn>;
   onBeforeFlatten(_type: unknown): void;
   onAfterFlatten(): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral } from "@atscript/db-sql-tools";
+import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /**
@@ -77,11 +77,30 @@ const pgDialect = {
 		};
 	},
 	calendarBucket: pgCalendarBucket,
+	jsonExtract: pgJsonExtract,
 	createViewPrefix: "CREATE OR REPLACE VIEW",
 	paramPlaceholder(index) {
 		return `$${index}`;
 	}
 };
+/** Cast applied to the `#>>` text per leaf type — `jsonb_typeof()` names equal the type names. */
+const PG_JSON_LEAF_CAST = {
+	string: "",
+	number: "::double precision",
+	boolean: "::boolean"
+};
+/**
+* Typed read of a JSON leaf (`SqlDialect.jsonExtract`): `jsonb_typeof()`
+* guards the declared type, so a missing path, JSON `null` or another JSON
+* type yields NULL (no coercion). Numbers are `double precision`, booleans
+* native. The column is cast `::jsonb`, so JSON and JSONB storage both work.
+*/
+function pgJsonExtract(quotedCol, path, type) {
+	const p = sqlStringLiteral(`{${quotedJsonPathSegments(path).join(",")}}`);
+	const j = `(${quotedCol})::jsonb`;
+	const cast = PG_JSON_LEAF_CAST[type];
+	return `CASE jsonb_typeof(${j} #> ${p}) WHEN '${type}' THEN ${cast ? `(${j} #>> ${p})${cast}` : `${j} #>> ${p}`} END`;
+}
 /**
 * Calendar-bucket label over an epoch-ms column (BIGINT for
 * `@db.default.now`, DOUBLE PRECISION otherwise): TEXT `'YYYY-MM-DD'` — the
@@ -471,6 +490,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	calendarBucketUnits() {
 		return ALL_BUCKET_UNITS;
 	}
+	/** Every aggregate function, `countDistinct` included. */
+	aggregateFns() {
+		return ALL_AGGREGATE_FNS;
+	}
 	onBeforeFlatten(_type) {}
 	onAfterFlatten() {
 		for (const fd of this._table.fieldDescriptors) if (fd.collate === "nocase") this._nocaseColumns.add(fd.physicalName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.135",
+  "version": "0.1.136",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -55,8 +55,8 @@
     "@atscript/typescript": "^0.1.92",
     "@uniqu/core": "^0.1.11",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.135",
-    "@atscript/db-sql-tools": "^0.1.135"
+    "@atscript/db": "^0.1.136",
+    "@atscript/db-sql-tools": "^0.1.136"
   },
   "peerDependenciesMeta": {
     "pg": {