1.0.7

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -24,13 +24,14 @@ mirror:
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
     - lossless
     - docker

package.json

@@ -1,33 +1,35 @@
 {
   "name": "@pushrocks/smartmatch",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "private": false,
   "description": "a minimal matching library using picomatch",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild && tsbundle npm)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbundle": "^1.0.68",
     "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.11.7",
-    "tslint": "^5.11.0",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "@types/node": "^14.0.5",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "picomatch": "^2.2.1"
+    "matcher": "^3.0.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

ts/index.ts

@@ -1,14 +1,12 @@
 import * as plugins from './smartmatch.plugins';
 
 export class SmartMatch {
-  private picomatch;
-  public globString;
-  constructor(globStringArg: string) {
-    this.globString = globStringArg;
-    this.picomatch = plugins.picomatch(this.globString);
+  public wildcard: string;
+  constructor(wildcardArg: string) {
+    this.wildcard = wildcardArg;
   }
 
-  public match(matchStringArg): boolean {
-    return this.picomatch(matchStringArg);
+  public match(matchStringArg: string): boolean {
+    return plugins.matcher.isMatch(matchStringArg, this.wildcard);
   }
-}
+}

ts/smartmatch.plugins.ts

@@ -1,6 +1,4 @@
 // third party scope
-import picomatch from 'picomatch';
+import matcher from 'matcher';
 
-export {
-  picomatch
-}
+export { matcher };