@pgpm/types 0.11.1 → 0.12.2

package/README.md

@@ -22,9 +22,10 @@ Core PostgreSQL data types with SQL scripts.
 
 - **email**: Case-insensitive email address validation
 - **url**: HTTP/HTTPS URL validation
+- **origin**: Origin URL validation (scheme + host)
 - **hostname**: Domain name validation
 - **image**: JSON-based image metadata with URL and MIME type
-- **attachment**: JSON-based file attachment metadata with URL and MIME type
+- **attachment**: File attachment metadata as a URL string or JSON with URL and MIME type
 - **upload**: File upload metadata
 - **single_select**: Single selection field
 - **multiple_select**: Multiple selection field
@@ -156,7 +157,7 @@ INSERT INTO customers (domain) VALUES
 
 ### Image and Attachment Domains
 
-The `image` and `attachment` domains store JSON objects with URL and MIME type information.
+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.
 
 ```sql
 -- Valid image
@@ -166,9 +167,12 @@ INSERT INTO customers (profile_image) VALUES
 -- Valid attachment
 INSERT INTO customers (document) VALUES
   ('{"url": "https://storage.example.com/file.pdf", "mime": "application/pdf"}'::json);
+
+-- Valid attachment as plain URL
+INSERT INTO customers (document) VALUES ('https://storage.example.com/favicon.ico');
 ```
 
-**Structure**: Both domains expect JSON objects with `url` and `mime` properties.
+**Structure**: Image values and JSON-form attachments expect `url` and `mime` properties; attachments also allow a bare URL string.
 
 ## Domain Types Reference
 
@@ -176,9 +180,10 @@ INSERT INTO customers (document) VALUES
 |--------|-----------|-------------|---------|
 | `email` | `citext` | Case-insensitive email address | `user@example.com` |
 | `url` | `text` | HTTP/HTTPS URL | `https://example.com/path` |
+| `origin` | `text` | Origin (scheme + host) | `https://example.com` |
 | `hostname` | `text` | Domain name without protocol | `example.com` |
 | `image` | `json` | Image metadata with URL and MIME | `{"url": "...", "mime": "image/jpeg"}` |
-| `attachment` | `json` | File attachment metadata | `{"url": "...", "mime": "application/pdf"}` |
+| `attachment` | `json` | File attachment URL or metadata | `{"url": "...", "mime": "application/pdf"}` or `https://example.com/favicon.ico` |
 | `upload` | `text` | File upload identifier | Various formats |
 | `single_select` | `text` | Single selection value | Text value |
 | `multiple_select` | `text[]` | Multiple selection values | Array of text values |

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

@@ -3,10 +3,15 @@
 
 BEGIN;
 CREATE DOMAIN attachment AS jsonb CHECK (
-  value ?& ARRAY['url', 'mime']
-  AND
-  value->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
+  (
+    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]*$'
+  )
 );
 COMMENT ON DOMAIN attachment IS E'@name launchqlInternalTypeAttachment';
 COMMIT;
-

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

@@ -1,10 +1,8 @@
 -- Deploy schemas/public/domains/origin to pg
-
 -- requires: schemas/public/schema
 
 BEGIN;
-
-CREATE DOMAIN origin AS text CHECK (VALUE = substring(VALUE from '^(https?://[^/]*)') );
+CREATE DOMAIN origin AS text CHECK (VALUE = substring(VALUE from '^(https?://[^/]*)'));
 COMMENT ON DOMAIN origin IS E'@name launchqlInternalTypeOrigin';
-
 COMMIT;
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/types",
-  "version": "0.11.1",
+  "version": "0.12.2",
   "description": "Core PostgreSQL data types with deploy/verify/revert SQL scripts",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -21,7 +21,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpm/verify": "0.11.1"
+    "@pgpm/verify": "0.12.0"
   },
   "devDependencies": {
     "pgpm": "^0.2.0"
@@ -34,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/launchql/pgpm-modules/issues"
   },
-  "gitHead": "be389fbf6f76be3b9728de2ab774a60209566f06"
+  "gitHead": "880c1b99631ac536288584ace0ac3dd40300f17e"
 }

package/pgpm.plan

@@ -8,6 +8,7 @@ schemas/public/domains/email [schemas/public/schema] 2017-08-11T08:11:51Z skitch
 schemas/public/domains/hostname [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/hostname
 schemas/public/domains/image [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/image
 schemas/public/domains/multiple_select [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/multiple_select
+schemas/public/domains/origin [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/origin
 schemas/public/domains/single_select [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/single_select
 schemas/public/domains/upload [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/upload
 schemas/public/domains/url [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/url

package/revert/schemas/public/domains/origin.sql

@@ -5,3 +5,4 @@ BEGIN;
 DROP TYPE public.origin;
 
 COMMIT;
+

package/verify/schemas/public/domains/origin.sql

@@ -5,3 +5,4 @@ BEGIN;
 SELECT verify_type ('public.origin');
 
 ROLLBACK;
+