pg-dump-parser 1.7.0 → 1.8.1

package/dist/sortSchemaObjects.test.js

@@ -0,0 +1,343 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const parsePgDump_1 = require("./parsePgDump");
+const sortSchemaObjects_1 = require("./sortSchemaObjects");
+const multiline_ts_1 = __importDefault(require("multiline-ts"));
+const vitest_1 = require("vitest");
+(0, vitest_1.describe)('sortSchemaObjects', () => {
+    (0, vitest_1.test)('sorts schema objects by type order', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: foo; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.foo (
+          id integer NOT NULL,
+          name text NOT NULL
+      );
+      
+      
+      --
+      -- Name: bar; Type: INDEX; Schema: public; Owner: postgres
+      --
+      
+      CREATE INDEX bar ON public.foo USING btree (name);
+      
+      
+      --
+      -- Name: baz; Type: EXTENSION; Schema: -; Owner: -
+      --
+      
+      CREATE EXTENSION IF NOT EXISTS baz;
+      
+      
+      --
+      -- Name: qux; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT qux PRIMARY KEY (id);
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const sorted = (0, sortSchemaObjects_1.sortSchemaObjects)(schemaObjects);
+        // Extension should come first
+        (0, vitest_1.expect)(sorted[0].header).toMatchObject({ Name: 'baz', Type: 'EXTENSION' });
+        // Then table
+        (0, vitest_1.expect)(sorted[1].header).toMatchObject({ Name: 'foo', Type: 'TABLE' });
+        // Then constraint
+        (0, vitest_1.expect)(sorted[2].header).toMatchObject({ Name: 'qux', Type: 'CONSTRAINT' });
+        // Finally index
+        (0, vitest_1.expect)(sorted[3].header).toMatchObject({ Name: 'bar', Type: 'INDEX' });
+    });
+    (0, vitest_1.test)('sorts constraints by type (PRIMARY, UNIQUE, FOREIGN, CHECK)', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: foo foo_check; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT foo_check CHECK (id > 0);
+      
+      
+      --
+      -- Name: foo foo_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT foo_fkey FOREIGN KEY (bar_id) REFERENCES public.bar(id);
+      
+      
+      --
+      -- Name: foo foo_unique; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT foo_unique UNIQUE (name);
+      
+      
+      --
+      -- Name: foo foo_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT foo_pkey PRIMARY KEY (id);
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const sorted = (0, sortSchemaObjects_1.sortSchemaObjects)(schemaObjects);
+        // Primary key should come first
+        (0, vitest_1.expect)(sorted[0].sql).toContain('PRIMARY KEY');
+        // Then unique
+        (0, vitest_1.expect)(sorted[1].sql).toContain('UNIQUE');
+        // Then check
+        (0, vitest_1.expect)(sorted[2].sql).toContain('CHECK');
+        // Finally foreign key
+        (0, vitest_1.expect)(sorted[3].sql).toContain('FOREIGN KEY');
+    });
+    (0, vitest_1.test)('sorts indexes alphabetically within the same table', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: foo; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.foo (
+          id integer NOT NULL,
+          name text NOT NULL,
+          email text
+      );
+      
+      
+      --
+      -- Name: foo_name_idx; Type: INDEX; Schema: public; Owner: postgres
+      --
+      
+      CREATE INDEX foo_name_idx ON public.foo USING btree (name);
+      
+      
+      --
+      -- Name: foo_email_idx; Type: INDEX; Schema: public; Owner: postgres
+      --
+      
+      CREATE INDEX foo_email_idx ON public.foo USING btree (email);
+      
+      
+      --
+      -- Name: foo_id_idx; Type: INDEX; Schema: public; Owner: postgres
+      --
+      
+      CREATE INDEX foo_id_idx ON public.foo USING btree (id);
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const sorted = (0, sortSchemaObjects_1.sortSchemaObjects)(schemaObjects);
+        const indexes = sorted.filter((object) => 'Type' in object.header && object.header.Type === 'INDEX');
+        (0, vitest_1.expect)(indexes[0].header).toMatchObject({ Name: 'foo_email_idx' });
+        (0, vitest_1.expect)(indexes[1].header).toMatchObject({ Name: 'foo_id_idx' });
+        (0, vitest_1.expect)(indexes[2].header).toMatchObject({ Name: 'foo_name_idx' });
+    });
+    (0, vitest_1.test)('sorts comments by type and target', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: COLUMN foo.name; Type: COMMENT; Schema: public; Owner: postgres
+      --
+      
+      COMMENT ON COLUMN public.foo.name IS 'Name column';
+      
+      
+      --
+      -- Name: TABLE foo; Type: COMMENT; Schema: public; Owner: postgres
+      --
+      
+      COMMENT ON TABLE public.foo IS 'Foo table';
+      
+      
+      --
+      -- Name: COLUMN foo.id; Type: COMMENT; Schema: public; Owner: postgres
+      --
+      
+      COMMENT ON COLUMN public.foo.id IS 'ID column';
+      
+      
+      --
+      -- Name: EXTENSION pgcrypto; Type: COMMENT; Schema: -; Owner: -
+      --
+      
+      COMMENT ON EXTENSION pgcrypto IS 'Crypto extension';
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const sorted = (0, sortSchemaObjects_1.sortSchemaObjects)(schemaObjects);
+        const comments = sorted.filter((object) => 'Type' in object.header && object.header.Type === 'COMMENT');
+        // Extension comment first
+        (0, vitest_1.expect)(comments[0].header).toMatchObject({ Name: 'EXTENSION pgcrypto' });
+        // Then table comment
+        (0, vitest_1.expect)(comments[1].header).toMatchObject({ Name: 'TABLE foo' });
+        // Then column comments sorted by name
+        (0, vitest_1.expect)(comments[2].header).toMatchObject({ Name: 'COLUMN foo.id' });
+        (0, vitest_1.expect)(comments[3].header).toMatchObject({ Name: 'COLUMN foo.name' });
+    });
+    (0, vitest_1.test)('groups and sorts schema objects by scope', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: foo; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.foo (
+          id integer NOT NULL,
+          name text NOT NULL
+      );
+      
+      
+      --
+      -- Name: foo_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT foo_pkey PRIMARY KEY (id);
+      
+      
+      --
+      -- Name: foo_name_idx; Type: INDEX; Schema: public; Owner: postgres
+      --
+      
+      CREATE INDEX foo_name_idx ON public.foo USING btree (name);
+      
+      
+      --
+      -- Name: bar; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.bar (
+          id integer NOT NULL,
+          foo_id integer
+      );
+      
+      
+      --
+      -- Name: bar_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.bar
+          ADD CONSTRAINT bar_pkey PRIMARY KEY (id);
+      
+      
+      --
+      -- Name: bar_foo_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.bar
+          ADD CONSTRAINT bar_foo_id_fkey FOREIGN KEY (foo_id) REFERENCES public.foo(id);
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const grouped = (0, sortSchemaObjects_1.groupAndSortSchemaObjects)(schemaObjects);
+        // Should have two groups for the two tables
+        const tableGroups = Array.from(grouped.keys()).filter((key) => key.includes('TABLE:'));
+        (0, vitest_1.expect)(tableGroups).toHaveLength(2);
+        // Each group should be sorted internally
+        for (const [key, objects] of grouped.entries()) {
+            if (key.includes('TABLE:public:foo')) {
+                // foo table group should have table, constraint, and index
+                (0, vitest_1.expect)(objects).toHaveLength(3);
+                (0, vitest_1.expect)(objects[0].header).toMatchObject({ Type: 'TABLE' });
+                (0, vitest_1.expect)(objects[1].header).toMatchObject({ Type: 'CONSTRAINT' });
+                (0, vitest_1.expect)(objects[2].header).toMatchObject({ Type: 'INDEX' });
+            }
+            else if (key.includes('TABLE:public:bar')) {
+                // bar table group should have table and two constraints
+                (0, vitest_1.expect)(objects).toHaveLength(3);
+                (0, vitest_1.expect)(objects[0].header).toMatchObject({ Type: 'TABLE' });
+                (0, vitest_1.expect)(objects[1].header).toMatchObject({ Type: 'CONSTRAINT' });
+                (0, vitest_1.expect)(objects[2].header).toMatchObject({ Type: 'FK CONSTRAINT' });
+            }
+        }
+    });
+    (0, vitest_1.test)('sortSchemaObjectsByScope returns flat sorted array', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: foo; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.foo (
+          id integer NOT NULL
+      );
+      
+      
+      --
+      -- Name: foo_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.foo
+          ADD CONSTRAINT foo_pkey PRIMARY KEY (id);
+      
+      
+      --
+      -- Name: bar; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.bar (
+          id integer NOT NULL
+      );
+      
+      
+      --
+      -- Name: bar_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+      --
+      
+      ALTER TABLE ONLY public.bar
+          ADD CONSTRAINT bar_pkey PRIMARY KEY (id);
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const sorted = (0, sortSchemaObjects_1.sortSchemaObjectsByScope)(schemaObjects);
+        (0, vitest_1.expect)(sorted).toHaveLength(4);
+        // Objects should be grouped by table
+        // First bar table and its constraint
+        (0, vitest_1.expect)(sorted[0].header).toMatchObject({ Name: 'bar', Type: 'TABLE' });
+        (0, vitest_1.expect)(sorted[1].header).toMatchObject({
+            Name: 'bar_pkey',
+            Type: 'CONSTRAINT',
+        });
+        // Then foo table and its constraint
+        (0, vitest_1.expect)(sorted[2].header).toMatchObject({ Name: 'foo', Type: 'TABLE' });
+        (0, vitest_1.expect)(sorted[3].header).toMatchObject({
+            Name: 'foo_pkey',
+            Type: 'CONSTRAINT',
+        });
+    });
+    (0, vitest_1.test)('handles schemas correctly in sorting', () => {
+        const dump = (0, multiline_ts_1.default) `
+      --
+      -- Name: foo; Type: TABLE; Schema: custom; Owner: postgres
+      --
+      
+      CREATE TABLE custom.foo (
+          id integer NOT NULL
+      );
+      
+      
+      --
+      -- Name: foo; Type: TABLE; Schema: public; Owner: postgres
+      --
+      
+      CREATE TABLE public.foo (
+          id integer NOT NULL
+      );
+      
+      
+      --
+      -- Name: bar; Type: TABLE; Schema: -; Owner: postgres
+      --
+      
+      CREATE TABLE bar (
+          id integer NOT NULL
+      );
+    `;
+        const schemaObjects = (0, parsePgDump_1.parsePgDump)(dump);
+        const sorted = (0, sortSchemaObjects_1.sortSchemaObjects)(schemaObjects);
+        // Tables with null schema should come first
+        (0, vitest_1.expect)(sorted[0].header).toMatchObject({ Name: 'bar', Schema: null });
+        // Then sorted by schema name
+        (0, vitest_1.expect)(sorted[1].header).toMatchObject({ Name: 'foo', Schema: 'custom' });
+        (0, vitest_1.expect)(sorted[2].header).toMatchObject({ Name: 'foo', Schema: 'public' });
+    });
+});
+//# sourceMappingURL=sortSchemaObjects.test.js.map

package/dist/sortSchemaObjects.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortSchemaObjects.test.js","sourceRoot":"","sources":["../src/sortSchemaObjects.test.ts"],"names":[],"mappings":";;;;;AAAA,+CAA4C;AAC5C,2DAI6B;AAC7B,gEAAqC;AACrC,mCAAgD;AAEhD,IAAA,iBAAQ,EAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAA,aAAI,EAAC,oCAAoC,EAAE,GAAG,EAAE;QAC9C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;QAEhD,8BAA8B;QAC9B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC3E,aAAa;QACb,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACvE,kBAAkB;QAClB,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QAC5E,gBAAgB;QAChB,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,6DAA6D,EAAE,GAAG,EAAE;QACvE,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;QAEhD,gCAAgC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC/C,cAAc;QACd,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC1C,aAAa;QACb,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,sBAAsB;QACtB,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,oDAAoD,EAAE,GAAG,EAAE;QAC9D,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAC3B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CACtE,CAAC;QAEF,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QACnE,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QAChE,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,mCAAmC,EAAE,GAAG,EAAE;QAC7C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2BrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;QAEhD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAC5B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CACxE,CAAC;QAEF,0BAA0B;QAC1B,IAAA,eAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACzE,qBAAqB;QACrB,IAAA,eAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAChE,sCAAsC;QACtC,IAAA,eAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QACpE,IAAA,eAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,0CAA0C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkDrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,IAAA,6CAAyB,EAAC,aAAa,CAAC,CAAC;QAEzD,4CAA4C;QAC5C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5D,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACvB,CAAC;QACF,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,yCAAyC;QACzC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/C,IAAI,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACrC,2DAA2D;gBAC3D,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;gBAChE,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7D,CAAC;iBAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC5C,wDAAwD;gBACxD,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;gBAChE,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,oDAAoD,EAAE,GAAG,EAAE;QAC9D,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAA,4CAAwB,EAAC,aAAa,CAAC,CAAC;QAEvD,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE/B,qCAAqC;QACrC,qCAAqC;QACrC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACvE,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YACrC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;QAEH,oCAAoC;QACpC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACvE,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YACrC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,sCAAsC,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;KA0BrB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;QAEhD,4CAA4C;QAC5C,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACtE,6BAA6B;QAC7B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

@@ -2,24 +2,24 @@
   "author": {
     "email": "gajus@gajus.com",
     "name": "Gajus Kuizinas",
-    "url": "http://gajus.com"
+    "url": "https://gajus.com"
   },
   "dependencies": {
     "multiline-ts": "^4.0.1",
-    "zod": "^3.23.8"
+    "zod": "^4.3.5"
   },
   "description": "Parses PostgreSQL dump files into an array of schema objects.",
   "devDependencies": {
-    "@semantic-release/commit-analyzer": "^9.0.2",
-    "@semantic-release/github": "^8.0.7",
-    "@semantic-release/npm": "^9.0.2",
-    "@types/node": "^18.15.3",
-    "cspell": "^6.30.2",
-    "eslint": "^9.14.0",
-    "eslint-config-canonical": "^44.3.28",
-    "semantic-release": "^20.1.3",
-    "typescript": "^5.0.2",
-    "vitest": "^0.29.7"
+    "@semantic-release/commit-analyzer": "^13.0.1",
+    "@semantic-release/github": "^12.0.2",
+    "@semantic-release/npm": "^13.1.3",
+    "@types/node": "^25.0.8",
+    "cspell": "^9.6.0",
+    "eslint": "^9.39.2",
+    "eslint-config-canonical": "^47.3.7",
+    "semantic-release": "^25.0.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.17"
   },
   "engines": {
     "node": ">=22"
@@ -56,5 +56,5 @@
     "test:vitest": "vitest --run --passWithNoTests"
   },
   "types": "./dist/index.d.ts",
-  "version": "1.7.0"
+  "version": "1.8.1"
 }

package/src/index.ts

@@ -6,3 +6,8 @@ export {
   type TitleHeader,
 } from './parsePgDump';
 export { type SchemaObjectScope, scopeSchemaObject } from './scopeSchemaObject';
+export {
+  groupAndSortSchemaObjects,
+  sortSchemaObjects,
+  sortSchemaObjectsByScope,
+} from './sortSchemaObjects';

package/src/parsePgDump.test.ts

@@ -45,6 +45,25 @@ CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA public;
 COMMENT ON EXTENSION pgcrypto IS 'cryptographic functions';
 
 
+--
+-- Name: uid; Type: DOMAIN; Schema: public; Owner: postgres
+--
+
+CREATE DOMAIN public.uid AS text
+    DEFAULT uuid_generate_v4()
+    CONSTRAINT uid_not_empty CHECK ((length(VALUE) > 0));
+
+
+ALTER DOMAIN public.uid OWNER TO postgres;
+
+
+--
+-- Name: DOMAIN uid; Type: COMMENT; Schema: public; Owner: postgres
+--
+
+COMMENT ON DOMAIN public.uid IS 'User identifier domain';
+
+
 --
 -- Name: status; Type: TYPE; Schema: public; Owner: postgres
 --
@@ -417,7 +436,7 @@ const omit = <T extends Record<string, unknown>>(
   );
 
 const expectSchemeObject = (
-  expectedSchemaObject: { scope: null | SchemaObjectScope } & SchemaObject,
+  expectedSchemaObject: SchemaObject & { scope: null | SchemaObjectScope },
 ) => {
   const schemaObjects = parsePgDump(dump);
 
@@ -1034,6 +1053,46 @@ test('extracts EXTENSION', async () => {
   });
 });
 
+test('extracts DOMAIN', async () => {
+  expectSchemeObject({
+    header: {
+      Name: 'uid',
+      Owner: 'postgres',
+      Schema: 'public',
+      Type: 'DOMAIN',
+    },
+    scope: {
+      name: 'uid',
+      schema: 'public',
+      type: 'DOMAIN',
+    },
+    sql: multiline`
+      CREATE DOMAIN public.uid AS text
+          DEFAULT uuid_generate_v4()
+          CONSTRAINT uid_not_empty CHECK ((length(VALUE) > 0));
+    `,
+  });
+});
+
+test('extracts COMMENT on DOMAIN', async () => {
+  expectSchemeObject({
+    header: {
+      Name: 'DOMAIN uid',
+      Owner: 'postgres',
+      Schema: 'public',
+      Type: 'COMMENT',
+    },
+    scope: {
+      name: 'uid',
+      schema: 'public',
+      type: 'DOMAIN',
+    },
+    sql: multiline`
+      COMMENT ON DOMAIN public.uid IS 'User identifier domain';
+    `,
+  });
+});
+
 test('extracts ACL (ON TABLE)', async () => {
   expectSchemeObject({
     header: {

package/src/parsePgDump.ts

@@ -25,6 +25,7 @@ const AttributedHeaderZodSchema = z.object({
     'CONSTRAINT',
     'DEFAULT ACL',
     'DEFAULT',
+    'DOMAIN',
     'EXTENSION',
     'FK CONSTRAINT',
     'FUNCTION',
@@ -50,9 +51,9 @@ const HeaderZodSchema = z.union([
   AttributedHeaderZodSchema,
 ]);
 
+export type AttributedHeader = z.infer<typeof AttributedHeaderZodSchema>;
 export type Header = z.infer<typeof HeaderZodSchema>;
 export type TitleHeader = z.infer<typeof TitleHeaderZodSchema>;
-export type AttributedHeader = z.infer<typeof AttributedHeaderZodSchema>;
 
 const isHeader = (fragment: string): boolean => {
   return fragment.startsWith('--\n--');

package/src/scopeSchemaObject.ts

@@ -97,6 +97,7 @@ type CommentOnTarget = {
   type:
     | 'AGGREGATE'
     | 'COLUMN'
+    | 'DOMAIN'
     | 'EXTENSION'
     | 'FUNCTION'
     | 'INDEX'
@@ -112,7 +113,7 @@ type CommentOnTarget = {
 const extractCommentOnTarget = (fragment: string): CommentOnTarget => {
   const { target, type } =
     fragment.match(
-      /COMMENT ON (?<type>AGGREGATE|COLUMN|EXTENSION|FUNCTION|INDEX|MATERIALIZED VIEW|PROCEDURE|SEQUENCE|TABLE|TYPE|VIEW)\s(?<target>.+?) IS/u,
+      /COMMENT ON (?<type>AGGREGATE|COLUMN|DOMAIN|EXTENSION|FUNCTION|INDEX|MATERIALIZED VIEW|PROCEDURE|SEQUENCE|TABLE|TYPE|VIEW)\s(?<target>.+?) IS/u,
     )?.groups ?? {};
 
   if (!target) {
@@ -140,6 +141,7 @@ export type SchemaObjectScope =
       schema: string;
       type:
         | 'AGGREGATE'
+        | 'DOMAIN'
         | 'FUNCTION'
         | 'MATERIALIZED VIEW'
         | 'PROCEDURE'
@@ -339,6 +341,18 @@ const scopeComment = (
     };
   }
 
+  if (target.type === 'DOMAIN') {
+    const [, domainName] = z
+      .tuple([z.string(), z.string()])
+      .parse(subject.header.Name.split(' '));
+
+    return {
+      name: domainName,
+      schema: subject.header.Schema ?? 'public',
+      type: 'DOMAIN',
+    };
+  }
+
   return null;
 };
 
@@ -424,6 +438,14 @@ const scopeAttributedSchemaObject = (
     };
   }
 
+  if (subject.header.Type === 'DOMAIN') {
+    return {
+      name: subject.header.Name,
+      schema: subject.header.Schema ?? 'public',
+      type: 'DOMAIN',
+    };
+  }
+
   if (subject.header.Type === 'VIEW') {
     return {
       name: subject.header.Name,