npm - @liminalfunctions/framework - Versions diffs - 1.0.68 → 1.0.69 - Mend

@liminalfunctions/framework 1.0.68 → 1.0.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/dist/F_Collection.d.ts +2 -0
package/dist/F_Collection.js +5 -0
package/dist/F_Collection.js.map +1 -1
package/dist/F_Compile.js +18 -0
package/dist/F_Compile.js.map +1 -1
package/dist/code_generation/templates/utils.ts.mustache +1 -0
package/dist/utils/complex_query_validator_from_zod.d.ts +20 -0
package/dist/utils/complex_query_validator_from_zod.js +223 -0
package/dist/utils/complex_query_validator_from_zod.js.map +1 -0
package/dist/utils/query_object_to_mongodb_query.d.ts +1 -0
package/dist/utils/query_object_to_mongodb_query.js +1 -0
package/dist/utils/query_object_to_mongodb_query.js.map +1 -1
package/dist/utils/query_validator_from_zod.js +2 -1
package/dist/utils/query_validator_from_zod.js.map +1 -1
package/dist/utils/zod_loop_seperator.js +4 -0
package/dist/utils/zod_loop_seperator.js.map +1 -1
package/package.json +1 -1
package/src/F_Collection.ts +5 -0
package/src/F_Compile.ts +17 -0
package/src/code_generation/templates/utils.ts.mustache +1 -0
package/src/utils/complex_query_validator_from_zod.ts +252 -0
package/src/utils/query_object_to_mongodb_query.ts +1 -0
package/src/utils/query_validator_from_zod.ts +3 -1
package/src/utils/zod_loop_seperator.ts +5 -0
package/test/0_4_query_validator_to_advanced_query.test.ts +402 -0
package/test/1_0_basic_server.test.ts +1 -0
package/test/1_4_advanced_queries.test.ts +400 -0
package/test/2_0_client_library_basic_type_generation.test.ts +2 -2
package/test/2_0_client_library_query_type_generation.test.ts +10 -0
package/test/tmp/dist/types/brief_news_category_query.d.ts +1 -0
package/test/tmp/dist/types/client_query.d.ts +1 -0
package/test/tmp/dist/types/institution_query.d.ts +1 -0
package/test/tmp/dist/types/project_query.d.ts +1 -0
package/test/tmp/dist/utils/utils.js +4 -0
package/test/tmp/dist/utils/utils.js.map +1 -1
package/test/tmp/src/types/brief_news_category_query.ts +1 -0
package/test/tmp/src/types/client_query.ts +1 -0
package/test/tmp/src/types/institution_query.ts +1 -0
package/test/tmp/src/types/project_query.ts +1 -0
package/test/tmp/src/utils/utils.ts +1 -0
/package/test/{0_4_cache.test.ts → 0_5_cache.test.ts} +0 -0
/package/test/{0_5_malicious_keys.test.ts → 0_6_malicious_keys.test.ts} +0 -0
/package/test/{0_6_array_children.test.ts → 0_7_array_children.test.ts} +0 -0

package/test/0_4_query_validator_to_advanced_query.test.ts ADDED Viewed

@@ -0,0 +1,402 @@
+import assert from "assert";
+import { z } from 'zod'
+import { z_mongodb_id } from '../dist/utils/mongoose_from_zod.js';
+import { complex_query_validator_from_zod } from '../dist/utils/complex_query_validator_from_zod.js';
+describe('query validator to advanced query', function () {
+    it('advanced queries should fail if they get bad data', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            enum: z.enum(['one', 'two']),
+        }))
+        assert.throws(() => {
+            query_validator.parse({
+                test: 'bad'
+            })
+        })
+    });
+    it('advanced queries should be able to parse ands', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+        }))
+        query_validator.parse({
+            $and:[]
+        })
+    });
+    it('advanced queries should be able to parse ors', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+        }))
+        query_validator.parse({
+            $or:[]
+        })
+    });
+    it('advanced queries should be able to parse enum $eq', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            enum: z.enum(['one', 'two']),
+        }))
+        query_validator.parse({
+            $and:[{
+                enum: {
+                    $eq: 'one'
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse enum $in', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            enum: z.enum(['one', 'two']),
+        }))
+        query_validator.parse({
+            $and:[{
+                enum: {
+                    $in: ['one', 'two']
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse boolean $eq', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            bool: z.boolean(),
+        }))
+        query_validator.parse({
+            $and:[{
+                bool: {
+                    $eq: true
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse number $eq', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            num: z.number(),
+        }))
+        query_validator.parse({
+            $and:[{
+                num: {
+                    $eq: 5
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse number $lt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            num: z.number(),
+        }))
+        query_validator.parse({
+            $and:[{
+                num: {
+                    $lt: 5
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse number $gt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            num: z.number(),
+        }))
+        query_validator.parse({
+            $and:[{
+                num: {
+                    $gt: 5
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse number $lte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            num: z.number(),
+        }))
+        query_validator.parse({
+            $and:[{
+                num: {
+                    $lte: 5
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse number $gte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            num: z.number(),
+        }))
+        query_validator.parse({
+            $and:[{
+                num: {
+                    $gte: 5
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse date $eq', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.date(),
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $eq: new Date()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse date $gt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.date(),
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $gt: new Date()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse date $lt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.date(),
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $lt: new Date()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse date $gte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.date(),
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $gte: new Date()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse date $lte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.date(),
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $lte: new Date()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse coerce date $eq', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.coerce.date()
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $eq: new Date().toISOString()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse coerce date $gt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.coerce.date()
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $gt: new Date().toISOString()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse coerce date $lt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.coerce.date()
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $lt: new Date().toISOString()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse coerce date $gte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.coerce.date()
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $gte: new Date().toISOString()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse coerce date $lte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            date: z.coerce.date()
+        }))
+        query_validator.parse({
+            $and:[{
+                date: {
+                    $lte: new Date().toISOString()
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $eq', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $eq: '697b80da5a78eb5b841ad72f'
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $gt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $gt: '697b80da5a78eb5b841ad72f'
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $lt', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $lt: '697b80da5a78eb5b841ad72f'
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $gte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $gte: '697b80da5a78eb5b841ad72f'
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $lte', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $lte: '697b80da5a78eb5b841ad72f'
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $in', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $in: ['697b80da5a78eb5b841ad72f']
+                }
+            }]
+        })
+    });
+    it('advanced queries should be able to parse mongodb id $nin', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id
+        }))
+        query_validator.parse({
+            $and:[{
+                _id: {
+                    $nin: ['697b80da5a78eb5b841ad72f']
+                }
+            }]
+        })
+    });
+    it('advanced quey fields should be optional', async function () {
+        let query_validator = complex_query_validator_from_zod(z.object({
+            _id: z_mongodb_id,
+            enum: z.enum(['one', 'two']),
+            bool: z.boolean(),
+            num: z.number(),
+            date: z.date(),
+        }))
+        query_validator.parse({
+            $and:[]
+        })
+    });
+});

package/test/1_0_basic_server.test.ts CHANGED Viewed

@@ -61,6 +61,7 @@ describe('Basic Server', function () {
     // before any tests run, set up the server and the db connection
     before(async function() {
+        this.timeout(10000)
         express_app = express();
         express_app.use(express.json());
         db_connection = await mongoose.connect('mongodb://127.0.0.1:27017/');