@pgpm/types 0.12.2 → 0.14.0

package/LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2025 Dan Lynch <pyramation@gmail.com>
-Copyright (c) 2025 Interweb, Inc.
+Copyright (c) 2025 Constructive
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,15 +1,15 @@
 # @pgpm/types
 
 <p align="center" width="100%">
-  <img height="250" src="https://raw.githubusercontent.com/launchql/launchql/refs/heads/main/assets/outline-logo.svg" />
+  <img height="250" src="https://raw.githubusercontent.com/constructive-io/constructive/refs/heads/main/assets/outline-logo.svg" />
 </p>
 
 <p align="center" width="100%">
-  <a href="https://github.com/launchql/pgpm-modules/actions/workflows/ci.yml">
-    <img height="20" src="https://github.com/launchql/pgpm-modules/actions/workflows/ci.yml/badge.svg" />
+  <a href="https://github.com/constructive-io/pgpm-modules/actions/workflows/ci.yml">
+    <img height="20" src="https://github.com/constructive-io/pgpm-modules/actions/workflows/ci.yml/badge.svg" />
   </a>
-   <a href="https://github.com/launchql/pgpm-modules/blob/main/LICENSE"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"/></a>
-   <a href="https://www.npmjs.com/package/@pgpm/types"><img height="20" src="https://img.shields.io/github/package-json/v/launchql/pgpm-modules?filename=packages%2Fdata-types%2Ftypes%2Fpackage.json"/></a>
+   <a href="https://github.com/constructive-io/pgpm-modules/blob/main/LICENSE"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"/></a>
+   <a href="https://www.npmjs.com/package/@pgpm/types"><img height="20" src="https://img.shields.io/github/package-json/v/constructive-io/pgpm-modules?filename=packages%2Fdata-types%2Ftypes%2Fpackage.json"/></a>
 </p>
 
 Core PostgreSQL data types with SQL scripts.
@@ -68,7 +68,7 @@ pgpm deploy
 
 ```bash
 # 1. Create a workspace
-pgpm init --workspace
+pgpm init workspace
 
 # 2. Create your first module
 cd my-workspace
@@ -158,6 +158,7 @@ INSERT INTO customers (domain) VALUES
 ### Image and Attachment Domains
 
 The `image` domain stores JSON objects with URL and MIME type information. The `attachment` domain accepts either that JSON shape or a plain URL string.
+The `upload` domain uses the same JSON object shape as `image`, ensuring both the file URL and MIME type are present.
 
 ```sql
 -- Valid image
@@ -184,7 +185,7 @@ INSERT INTO customers (document) VALUES ('https://storage.example.com/favicon.ic
 | `hostname` | `text` | Domain name without protocol | `example.com` |
 | `image` | `json` | Image metadata with URL and MIME | `{"url": "...", "mime": "image/jpeg"}` |
 | `attachment` | `json` | File attachment URL or metadata | `{"url": "...", "mime": "application/pdf"}` or `https://example.com/favicon.ico` |
-| `upload` | `text` | File upload identifier | Various formats |
+| `upload` | `json` | File upload metadata (URL + MIME) | `{"url": "...", "mime": "application/pdf"}` |
 | `single_select` | `text` | Single selection value | Text value |
 | `multiple_select` | `text[]` | Multiple selection values | Array of text values |
 
@@ -212,17 +213,17 @@ The test suite validates:
 - Email format validation (valid and invalid cases)
 - URL format validation with extensive test cases
 - Hostname format validation
-- Image and attachment JSON structure validation
+- Image, upload, and attachment JSON structure validation
 
 ## Related Tooling
 
-* [pgpm](https://github.com/launchql/launchql/tree/main/packages/pgpm): **🖥️ PostgreSQL Package Manager** for modular Postgres development. Works with database workspaces, scaffolding, migrations, seeding, and installing database packages.
-* [pgsql-test](https://github.com/launchql/launchql/tree/main/packages/pgsql-test): **📊 Isolated testing environments** with per-test transaction rollbacks—ideal for integration tests, complex migrations, and RLS simulation.
-* [supabase-test](https://github.com/launchql/launchql/tree/main/packages/supabase-test): **🧪 Supabase-native test harness** preconfigured for the local Supabase stack—per-test rollbacks, JWT/role context helpers, and CI/GitHub Actions ready.
-* [graphile-test](https://github.com/launchql/launchql/tree/main/packages/graphile-test): **🔐 Authentication mocking** for Graphile-focused test helpers and emulating row-level security contexts.
-* [pgsql-parser](https://github.com/launchql/pgsql-parser): **🔄 SQL conversion engine** that interprets and converts PostgreSQL syntax.
-* [libpg-query-node](https://github.com/launchql/libpg-query-node): **🌉 Node.js bindings** for `libpg_query`, converting SQL into parse trees.
-* [pg-proto-parser](https://github.com/launchql/pg-proto-parser): **📦 Protobuf parser** for parsing PostgreSQL Protocol Buffers definitions to generate TypeScript interfaces, utility functions, and JSON mappings for enums.
+* [pgpm](https://github.com/constructive-io/constructive/tree/main/packages/pgpm): **🖥️ PostgreSQL Package Manager** for modular Postgres development. Works with database workspaces, scaffolding, migrations, seeding, and installing database packages.
+* [pgsql-test](https://github.com/constructive-io/constructive/tree/main/packages/pgsql-test): **📊 Isolated testing environments** with per-test transaction rollbacks—ideal for integration tests, complex migrations, and RLS simulation.
+* [supabase-test](https://github.com/constructive-io/constructive/tree/main/packages/supabase-test): **🧪 Supabase-native test harness** preconfigured for the local Supabase stack—per-test rollbacks, JWT/role context helpers, and CI/GitHub Actions ready.
+* [graphile-test](https://github.com/constructive-io/constructive/tree/main/packages/graphile-test): **🔐 Authentication mocking** for Graphile-focused test helpers and emulating row-level security contexts.
+* [pgsql-parser](https://github.com/constructive-io/pgsql-parser): **🔄 SQL conversion engine** that interprets and converts PostgreSQL syntax.
+* [libpg-query-node](https://github.com/constructive-io/libpg-query-node): **🌉 Node.js bindings** for `libpg_query`, converting SQL into parse trees.
+* [pg-proto-parser](https://github.com/constructive-io/pg-proto-parser): **📦 Protobuf parser** for parsing PostgreSQL Protocol Buffers definitions to generate TypeScript interfaces, utility functions, and JSON mappings for enums.
 
 ## Disclaimer
 

package/__tests__/domains.pgutils.test.ts

@@ -44,15 +44,37 @@ const invalidUrls = [
 ];
 
 const validAttachments = [
+  'http://www.foo.bar/some.jpg',
+  'https://foo.bar/some.PNG'
+];
+
+const invalidAttachments = [
+  'hi there',
+  'ftp://foo.bar/some.png',
+  'https:///foo.bar/some.png'
+];
+
+const validImages = [
   { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
   { url: 'https://foo.bar/some.PNG', mime: 'image/jpg' }
 ];
 
-const invalidAttachments = [
+const invalidImages = [
   { url: 'hi there' },
   { url: 'https://foo.bar/some.png' }
 ];
 
+const validUploads = [
+  { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
+  { url: 'https://foo.bar/some.PNG', mime: 'image/png' }
+];
+
+const invalidUploads = [
+  { url: 'hi there' },
+  { url: 'https://foo.bar/some.png' },
+  { url: 'ftp://foo.bar/some.png', mime: 'image/png' }
+];
+
 let pg: PgTestClient;
 let teardown:  () => Promise<void>;
 
@@ -68,7 +90,8 @@ CREATE TABLE customers (
   image image,
   attachment attachment,
   domain hostname,
-  email email
+  email email,
+  upload upload
 );
   `);
 });
@@ -87,24 +110,48 @@ afterAll(async () => {
 
 describe('types', () => {
   it('valid attachment and image', async () => {
-    for (const value of validAttachments) {
-      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [value]);
-      await pg.any(`INSERT INTO customers (attachment) VALUES ($1::json);`, [value]);
+    for (const attachment of validAttachments) {
+      await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
+    }
+
+    for (const image of validImages) {
+      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
     }
   });
 
   it('invalid attachment and image', async () => {
-    for (const value of invalidAttachments) {
+    for (const attachment of invalidAttachments) {
       let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
       } catch (e) {
         failed = true;
       }
       expect(failed).toBe(true);
-      failed = false;
+    }
+
+    for (const image of invalidImages) {
+      let failed = false;
+      try {
+        await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
+      } catch (e) {
+        failed = true;
+      }
+      expect(failed).toBe(true);
+    }
+  });
+
+  it('valid upload', async () => {
+    for (const upload of validUploads) {
+      await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
+    }
+  });
+
+  it('invalid upload', async () => {
+    for (const upload of invalidUploads) {
+      let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (image) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
       } catch (e) {
         failed = true;
       }

package/__tests__/domains.test.ts

@@ -44,15 +44,37 @@ const invalidUrls = [
 ];
 
 const validAttachments = [
+  'http://www.foo.bar/some.jpg',
+  'https://foo.bar/some.PNG'
+];
+
+const invalidAttachments = [
+  'hi there',
+  'ftp://foo.bar/some.png',
+  'https:///foo.bar/some.png'
+];
+
+const validImages = [
   { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
   { url: 'https://foo.bar/some.PNG', mime: 'image/jpg' }
 ];
 
-const invalidAttachments = [
+const invalidImages = [
   { url: 'hi there' },
   { url: 'https://foo.bar/some.png' }
 ];
 
+const validUploads = [
+  { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
+  { url: 'https://foo.bar/some.PNG', mime: 'image/png' }
+];
+
+const invalidUploads = [
+  { url: 'hi there' },
+  { url: 'https://foo.bar/some.png' },
+  { url: 'ftp://foo.bar/some.png', mime: 'image/png' }
+];
+
 let pg: PgTestClient;
 let teardown:  () => Promise<void>;
 
@@ -68,7 +90,8 @@ CREATE TABLE customers (
   image image,
   attachment attachment,
   domain hostname,
-  email email
+  email email,
+  upload upload
 );
   `);
 });
@@ -87,24 +110,48 @@ afterAll(async () => {
 
 describe('types', () => {
   it('valid attachment and image', async () => {
-    for (const value of validAttachments) {
-      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [value]);
-      await pg.any(`INSERT INTO customers (attachment) VALUES ($1::json);`, [value]);
+    for (const attachment of validAttachments) {
+      await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
+    }
+
+    for (const image of validImages) {
+      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
     }
   });
 
   it('invalid attachment and image', async () => {
-    for (const value of invalidAttachments) {
+    for (const attachment of invalidAttachments) {
       let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
       } catch (e) {
         failed = true;
       }
       expect(failed).toBe(true);
-      failed = false;
+    }
+
+    for (const image of invalidImages) {
+      let failed = false;
+      try {
+        await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
+      } catch (e) {
+        failed = true;
+      }
+      expect(failed).toBe(true);
+    }
+  });
+
+  it('valid upload', async () => {
+    for (const upload of validUploads) {
+      await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
+    }
+  });
+
+  it('invalid upload', async () => {
+    for (const upload of invalidUploads) {
+      let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (image) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
       } catch (e) {
         failed = true;
       }

package/deploy/schemas/public/domains/attachment.sql

@@ -2,16 +2,6 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-CREATE DOMAIN attachment AS jsonb CHECK (
-  (
-    jsonb_typeof(VALUE) = 'object'
-    AND VALUE ?& ARRAY['url', 'mime']
-    AND VALUE->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
-  )
-  OR (
-    jsonb_typeof(VALUE) = 'string'
-    AND VALUE #>> '{}' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
-  )
-);
+CREATE DOMAIN attachment AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
 COMMENT ON DOMAIN attachment IS E'@name launchqlInternalTypeAttachment';
 COMMIT;

package/deploy/schemas/public/domains/upload.sql

@@ -4,7 +4,11 @@
 
 BEGIN;
 
-CREATE DOMAIN upload AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
+CREATE DOMAIN upload AS jsonb CHECK (
+  value ?& ARRAY['url', 'mime']
+  AND
+  value->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
+);
 COMMENT ON DOMAIN upload IS E'@name launchqlInternalTypeUpload';
 
 COMMIT;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@pgpm/types",
-  "version": "0.12.2",
+  "version": "0.14.0",
   "description": "Core PostgreSQL data types with deploy/verify/revert SQL scripts",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
-    "Interweb <developers@interweb.co>"
+    "Constructive <developers@constructive.io>"
   ],
   "keywords": [
     "postgresql",
@@ -21,18 +21,18 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpm/verify": "0.12.0"
+    "@pgpm/verify": "0.14.0"
   },
   "devDependencies": {
-    "pgpm": "^0.2.0"
+    "pgpm": "^1.0.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/launchql/pgpm-modules"
+    "url": "https://github.com/constructive-io/pgpm-modules"
   },
-  "homepage": "https://github.com/launchql/pgpm-modules",
+  "homepage": "https://github.com/constructive-io/pgpm-modules",
   "bugs": {
-    "url": "https://github.com/launchql/pgpm-modules/issues"
+    "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "880c1b99631ac536288584ace0ac3dd40300f17e"
+  "gitHead": "7369638ab084da95b0cb00ec63ad236637f6ebe5"
 }

package/sql/launchql-types--0.9.0.sql

@@ -35,12 +35,15 @@ CREATE DOMAIN single_select AS jsonb
 
 COMMENT ON DOMAIN single_select IS '@name launchqlInternalTypeSingleSelect';
 
-CREATE DOMAIN upload AS text 
-  CHECK (value ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$');
+CREATE DOMAIN upload AS jsonb 
+  CHECK (
+  value ?& ARRAY['url', 'mime']
+    AND (value ->> 'url') ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$'
+);
 
 COMMENT ON DOMAIN upload IS '@name launchqlInternalTypeUpload';
 
 CREATE DOMAIN url AS text 
   CHECK (value ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$');
 
-COMMENT ON DOMAIN url IS '@name launchqlInternalTypeUrl';
+COMMENT ON DOMAIN url IS '@name launchqlInternalTypeUrl';