Merge pull request #36 from zanerock/work-liquid-labs/regex-repo/35

Test use of RE strings for partial string matches and update docs

Author: zanerock

README.md

@@ -12,24 +12,31 @@ npm i @liquid-labs/regex-repo
 ## Usage
 
 ```javascript
-import { emailRE } from '@liquid-labs/regex-repo'
-// import * as regex from '@liquid-labs/regex-repo'
+import { emailRE } from '@liquid-labs/regex-repo' // ES6
+// const { emailRE } = require('@liquid-labs/regex-repo') // cjs
 
 const verified = emailRE.test(userInput)
 ```
 
 ## Regex reference
 
-Each regular expression listed below is paired with an exported embeddable string named `xxxString`. E.g., `rgbRE` is paired with `rgbREString`. While the RE is pinned to the beginning and end of the value; i.e, the RE begins with '^' and ends with '$', the string does not. It is up to the user to identify token seperators when using the RE strings. E.g., if using `rgbREString` in a larger RE, one might do something like:
+Each regular expression listed below is paired with an embeddable string named `xxxString`. E.g., `rgbRE` is paired with `rgbREString`. Each RE will only match strings that are the given type and nothing else. I.e., the RE begins with '^' and ends with '$'. The `xxxREString` can be used for partial matches, `matchAll`s, and used as part of larger expressions. E.g., to find all unique CSS RGB colors used in a style sheet, you might do something like:
 
 ```javascript
 import { rgbREString } from '@liquid-labs/regex-repo'
 
 const allColors = cssContent
-  .matchAll(new RegExp(`[ :](${rgbREString})`)).map((match) => match[1])
+  .matchAll(new RegExp(`[ :](${rgbREString})[; }]`, 'g'))
+  .map((match) => match[1]) // extract the capture group
   .filter((v, i, arr) => i === arr.indexOf(v)) // filter non-unique items
   .sort()
 ```
+
+### AWS
+
+- __awsS3BucketNameRE__: Matches valid S3 bucket name. Note `awsS3BucketNameREString` cannot be used for partial matches.
+- __awsS3TABucketNameRE__: Matches S3 Transfer Acceleration compatible S3 bucket name. Note `awsS3TABucketNameREString` cannot be used for partial matches.
+
 ### CSS numbers
 
 - __zeroTo100FloatPercentRE__: Matches a 0 to 100% float as used in CSS color specifications.

make/10-resources.mk

@@ -2,13 +2,13 @@
 # https://npmjs.com/package/@liquid-labs/catalyst-builder-node for further details
 
 CATALYST_BABEL:=npx babel
-CATALYST_BABEL_CONFIG:=$(shell npm explore @liquid-labs/catalyst-resource-babel-and-rollup -- pwd)/dist/babel/babel.config.cjs
+CATALYST_BABEL_CONFIG:=$(shell npm explore @liquid-labs/sdlc-resource-babel-and-rollup -- pwd)/dist/babel/babel.config.cjs
 
 CATALYST_ROLLUP:=npx rollup
-CATALYST_ROLLUP_CONFIG:=$(shell npm explore @liquid-labs/catalyst-resource-babel-and-rollup -- pwd)/dist/rollup/rollup.config.mjs
+CATALYST_ROLLUP_CONFIG:=$(shell npm explore @liquid-labs/sdlc-resource-babel-and-rollup -- pwd)/dist/rollup/rollup.config.mjs
 
 CATALYST_JEST:=npx jest
-CATALYST_JEST_CONFIG:=$(shell npm explore @liquid-labs/catalyst-resource-jest -- pwd)/dist/jest.config.js
+CATALYST_JEST_CONFIG:=$(shell npm explore @liquid-labs/sdlc-resource-jest -- pwd)/dist/jest.config.js
 
 CATALYST_ESLINT:=npx eslint
-CATALYST_ESLINT_CONFIG:=$(shell npm explore @liquid-labs/catalyst-resource-eslint -- pwd)/dist/eslint.config.js
+CATALYST_ESLINT_CONFIG:=$(shell npm explore @liquid-labs/sdlc-resource-eslint -- pwd)/dist/eslint.config.cjs

make/55-lint.mk

@@ -10,28 +10,21 @@ CATALYST_LINT_PASS_MARKER:=$(QA)/.lint.passed
 LINT_TARGETS+=$(CATALYST_LINT_REPORT) $(CATALYST_LINT_PASS_MARKER)
 PRECIOUS_TARGETS+=$(CATALYST_LINT_REPORT)
 
-LINT_IGNORE_PATTERNS:=--ignore-pattern '$(DIST)/**/*'\
---ignore-pattern '$(TEST_STAGING)/**/*'
-
 $(CATALYST_LINT_REPORT) $(CATALYST_LINT_PASS_MARKER): $(CATALYST_ALL_JS_FILES_SRC)
 	mkdir -p $(dir $@)
 	echo -n 'Test git rev: ' > $(CATALYST_LINT_REPORT)
 	git rev-parse HEAD >> $(CATALYST_LINT_REPORT)
 	( set -e; set -o pipefail; \
-	  $(CATALYST_ESLINT) \
+	  ESLINT_USE_FLAT_CONFIG=true $(CATALYST_ESLINT) \
 	    --config $(CATALYST_ESLINT_CONFIG) \
-	    --ext .cjs,.js,.mjs,.cjs,.xjs \
-	    $(LINT_IGNORE_PATTERNS) \
 	    . \
 	    | tee -a $(CATALYST_LINT_REPORT); \
 	  touch $(CATALYST_LINT_PASS_MARKER) )
 
 lint-fix:
 	@( set -e; set -o pipefail; \
-	  $(CATALYST_ESLINT) \
+	  ESLINT_USE_FLAT_CONFIG=true $(CATALYST_ESLINT) \
 	    --config $(CATALYST_ESLINT_CONFIG) \
-	    --ext .js,.mjs,.cjs,.xjs \
-	    $(LINT_IGNORE_PATTERNS) \
 	    --fix . )
 
 #####