1.0.16

.gitea/workflows/gitzone_ci_default.yaml

@@ -0,0 +1,104 @@
+name: CI Pipeline
+
+on: push
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+jobs:
+
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: $
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install pnpm and npmci
+      run: |
+        pnpm install -g pnpm
+        pnpm install -g @shipzone/npmci
+
+    - name: Run npm prepare
+      run: npmci npm prepare
+
+    - name: Audit production dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --prod
+
+    - name: Audit development dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --dev
+
+  test:
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: $
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Test stable
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm test
+
+    - name: Test build
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: $
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Release
+      run: |
+        npmci node install stable
+        npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: $
+    continue-on-error: true
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Code quality
+      run: |
+        npmci command npm install -g typescript
+        npmci npm prepare
+        npmci npm install
+
+    - name: Trigger
+      run: npmci trigger
+
+    - name: Build docs and upload artifacts
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci command npm run buildDocs
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: public
+        path: public
+        retention-days: 7

.gitlab-ci.yml

@@ -13,8 +13,13 @@ stages:
   - metadata
 
 before_script:
-  - npm install -g @shipzone/npmci
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
+# ====================
+# security stage
+# ====================
 # ====================
 # security stage
 # ====================
@@ -22,11 +27,10 @@ auditProductionDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
+     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm install --production --ignore-scripts
+     - npmci command pnpm audit --audit-level=high --prod
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -34,11 +38,10 @@ auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=dev
+    - npmci command pnpm audit --audit-level=high --dev
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -49,7 +52,6 @@ auditDevDependencies:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
@@ -60,10 +62,9 @@ testStable:
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
-    - npmci command npm run build
+    - npmci npm build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -112,7 +113,6 @@ pages:
   stage: metadata
   script:
     - npmci node install stable
-    - npmci npm prepare
     - npmci npm install
     - npmci command npm run buildDocs
   tags:

npmextra.json

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartexpect",
       "description": "manage expectations in code",
-      "npmPackagename": "@pushrocks/smartexpect",
+      "npmPackagename": "@push.rocks/smartexpect",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartexpect",
+  "name": "@push.rocks/smartexpect",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "private": false,
   "description": "manage expectations in code",
   "main": "dist_ts/index.js",
@@ -14,17 +14,18 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsbundle": "^2.0.5",
+    "@gitzone/tsbundle": "^2.0.8",
-    "@gitzone/tstest": "^1.0.71",
+    "@gitzone/tsrun": "^1.2.42",
-    "@pushrocks/tapbundle": "^5.0.3",
+    "@gitzone/tstest": "^1.0.74",
-    "@types/node": "^18.0.6",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^20.3.1",
     "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpromise": "^4.0.2",
     "fast-deep-equal": "^3.1.3"
   },
   "browserslist": [

readme.md

@@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt
 PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartexpect)](https://lossless.cloud)
 PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartexpect)](https://lossless.cloud)
 BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartexpect)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -33,7 +32,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -22,6 +22,11 @@ tap.test('should check equality', async () => {
   smartexpect.expect('hithere').not.toEqual('hithere2');
 });
 
+tap.test('should check for regexp matching', async () => {
+  smartexpect.expect('hithere').toMatch(/hi/);
+  smartexpect.expect('hithere').not.toMatch(/ho/);
+});
+
 tap.test('should correctly state property presence', async () => {
   const testObject = {
     aprop: 'hello',

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartexpect',
+  name: '@push.rocks/smartexpect',
-  version: '1.0.14',
+  version: '1.0.16',
   description: 'manage expectations in code'
 }

ts/smartexpect.classes.assertion.ts

@@ -118,6 +118,17 @@ export class Assertion {
     });
   }
 
+  public toMatch(comparisonObject: RegExp) {
+    return this.runCheck(() => {
+      const result = comparisonObject.test(this.getObjectToTestReference());
+      if (!result) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} does not equal ${comparisonObject}`
+        );
+      }
+    });
+  }
+
   public toBeTrue() {
     return this.runCheck(() => {
       const result =
@@ -266,6 +277,207 @@ export class Assertion {
     });
   }
 
+  // ... previous code ...
+
+  public toBeOneOf(values: any[]) {
+    return this.runCheck(() => {
+      const result = values.includes(this.getObjectToTestReference());
+      if (!result) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not one of ${values}`
+        );
+      }
+    });
+  }
+
+  public toHaveLength(length: number) {
+    return this.runCheck(() => {
+      const obj = this.getObjectToTestReference();
+      if (typeof obj.length !== 'number' || obj.length !== length) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} does not have a length of ${length}`
+        );
+      }
+    });
+  }
+
+  public toBeCloseTo(value: number, precision = 2) {
+    return this.runCheck(() => {
+      const difference = Math.abs(this.getObjectToTestReference() - value);
+      if (difference > Math.pow(10, -precision) / 2) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not close to ${value} up to ${precision} decimal places`
+        );
+      }
+    });
+  }
+
+  public toThrow(expectedError?: any) {
+    return this.runCheck(() => {
+      let thrown = false;
+      try {
+        this.getObjectToTestReference()();
+      } catch (e) {
+        thrown = true;
+        if (expectedError && !(e instanceof expectedError)) {
+          throw new Error(
+            `Expected function to throw ${expectedError.name}, but it threw ${e.name}`
+          );
+        }
+      }
+      if (!thrown) {
+        throw new Error(`Expected function to throw, but it didn't.`);
+      }
+    });
+  }
+
+  public toBeTruthy() {
+    return this.runCheck(() => {
+      if (!this.getObjectToTestReference()) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not truthy`
+        );
+      }
+    });
+  }
+
+  public toBeFalsy() {
+    return this.runCheck(() => {
+      if (this.getObjectToTestReference()) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not falsy`
+        );
+      }
+    });
+  }
+
+  public toBeGreaterThanOrEqual(numberArg: number) {
+    return this.runCheck(() => {
+      if (this.getObjectToTestReference() <= numberArg) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not greater than or equal to ${numberArg}`
+        );
+      }
+    });
+  }
+
+  public toBeLessThanOrEqual(numberArg: number) {
+    return this.runCheck(() => {
+      if (this.getObjectToTestReference() >= numberArg) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not less than or equal to ${numberArg}`
+        );
+      }
+    });
+  }
+
+  public toMatchObject(objectArg: object) {
+    return this.runCheck(() => {
+      function deepEqual(obj1: any, obj2: any): boolean {
+        // If both are of primitive types and are equal
+        if (obj1 === obj2) {
+          return true;
+        }
+      
+        // If either of them is null or not an object
+        if (typeof obj1 !== 'object' || obj1 === null || typeof obj2 !== 'object' || obj2 === null) {
+          return false;
+        }
+      
+        const keys1 = Object.keys(obj1);
+        const keys2 = Object.keys(obj2);
+      
+        // If their properties' count doesn't match
+        if (keys1.length !== keys2.length) {
+          return false;
+        }
+      
+        // Checking if every property in obj1 has a counterpart in obj2
+        for (const key of keys1) {
+          if (!keys2.includes(key)) {
+            return false;
+          }
+          if (!deepEqual(obj1[key], obj2[key])) {
+            return false;
+          }
+        }
+      
+        return true;
+      }      
+      const partialMatch = deepEqual(
+        this.getObjectToTestReference(),
+        objectArg
+      ); // Note: Implement a deep comparison function or use one from a library
+      if (!partialMatch) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} does not match the object ${objectArg}`
+        );
+      }
+    });
+  }
+
+  public toContainEqual(value: any) {
+    return this.runCheck(() => {
+      const arr = this.getObjectToTestReference();
+      const found = arr.some((item: any) => plugins.fastDeepEqual(item, value)); // Assuming fastDeepEqual checks deep equality
+      if (!found) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} does not contain the value ${value}`
+        );
+      }
+    });
+  }
+
+  public toBeArray() {
+    return this.runCheck(() => {
+      if (!Array.isArray(this.getObjectToTestReference())) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not an array`
+        );
+      }
+    });
+  }
+
+  public toInclude(substring: string) {
+    return this.runCheck(() => {
+      if (!this.getObjectToTestReference().includes(substring)) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} does not include the substring ${substring}`
+        );
+      }
+    });
+  }
+
+  public toBeDate() {
+    return this.runCheck(() => {
+      if (!(this.getObjectToTestReference() instanceof Date)) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not a date`
+        );
+      }
+    });
+  }
+
+  public toBeBeforeDate(date: Date) {
+    return this.runCheck(() => {
+      if (!(this.getObjectToTestReference() < date)) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not before ${date}`
+        );
+      }
+    });
+  }
+
+  public toBeAfterDate(date: Date) {
+    return this.runCheck(() => {
+      if (!(this.getObjectToTestReference() > date)) {
+        throw new Error(
+          `${this.baseReference} with drill down ${this.propertyDrillDown} is not after ${date}`
+        );
+      }
+    });
+  }
+
   public property(propertyNameArg: string) {
     this.propertyDrillDown.push(propertyNameArg);
     return this;

tsconfig.json

@@ -5,6 +5,7 @@
     "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "nodenext",
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
   }
 }