devit

.github/workflows/dev-ci.yaml

@@ -0,0 +1,48 @@
+# workflow to ensure development tooling and environment is properly set up
+name: Dev Environment Contingency
+run-name: Dev Environment Contingency
+
+
+permissions:
+  contents: write
+
+on:
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  test-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        id: checkout
+      - name: Install Task
+        id: install-task
+        uses: arduino/setup-task@v1
+        with:
+          version: 3.x
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run all tasks in the workflow 
+        id: run-all-tasks
+        run: |
+          # Capture the list of all tasks
+          OUTPUT=$(task --list-all)
+
+          # Parse the list of tasks from the output
+          TASKS=$(echo "$OUTPUT" | grep -oP '(?<=\* ).*(?=:)')
+
+          # Check if TASKS variable is not empty
+          if [ -z "$TASKS" ]; then
+              echo "No tasks found."
+              exit 1
+          fi
+
+          # Iterate over each task and execute it
+          for TASK in $TASKS; do
+              echo "Executing task: $TASK"
+              task "$TASK"
+              echo "Completed task: $TASK"
+              echo "----------------------------"
+          done

tools/seltabls/cmd/cmds/static.go

@@ -23,8 +23,6 @@
 	packageName string
 	fileName    string
 
-	body string
-
 	form = huh.NewForm(
 		huh.NewGroup(
 			huh.NewInput().
@@ -43,7 +41,8 @@
 	)
 )
 
+// NewStaticCmd createa a new command for the static command.
 func NewStaticCmd(ctx context.Context) *cobra.Command {
 	return &cobra.Command{
 		Use:   "static",
 		Short: "Statically define html given a url.",
@@ -87,6 +86,9 @@
 				PackageName: packageName,
 				FileName:    staticFileName,
 			})
+			if err != nil {
+				return fmt.Errorf("failed to get url: %w", err)
+			}
 			err = os.WriteFile(fileName+"_test.go", []byte(content), 0644)
 			if err != nil {
 				return fmt.Errorf("failed to write file: %w", err)
@@ -189,7 +191,10 @@
 		return "", fmt.Errorf("failed to create file: %w", err)
 	}
 	defer f.Close()
-	f.Write(body)
+	_, err = f.Write(body)
+	if err != nil {
+		return "", fmt.Errorf("failed to write file: %w", err)
+	}
 
 	return safeFileName + ".html", nil
 }

tools/seltabls/data/master/combined/queries.sql

@@ -451,4 +451,14 @@ ON CONFLICT (value)
 DO UPDATE
     SET
         html_id = excluded.html_id RETURNING *;
+
+-- name: UpsertURLOnURL :one
+INSERT INTO
+    urls (value, html_id)
+VALUES
+    (?, ?)
+ON CONFLICT (value)
+DO UPDATE
+    SET
+        html_id = excluded.html_id RETURNING id, value, html_id;
 /******************************************************************************/

tools/seltabls/data/master/queries/urls.sql

@@ -59,4 +59,14 @@ ON CONFLICT (value)
 DO UPDATE
     SET
         html_id = excluded.html_id RETURNING *;
+
+-- name: UpsertURLOnURL :one
+INSERT INTO
+    urls (value, html_id)
+VALUES
+    (?, ?)
+ON CONFLICT (value)
+DO UPDATE
+    SET
+        html_id = excluded.html_id RETURNING id, value, html_id;
 /******************************************************************************/

tools/seltabls/pkg/analysis/textDocumentCompletion.go

@@ -34,6 +34,7 @@
 	urls *safe.Map[uri.URI, []string],
 	selectors *safe.Map[uri.URI, []master.Selector],
 ) (response *lsp.TextDocumentCompletionResponse, err error) {
+	log.Debugf("CreateTextDocumentCompletion")
 	select {
 	case <-ctx.Done():
 		return nil, fmt.Errorf("context cancelled: %w", ctx.Err())
@@ -102,19 +103,19 @@
 					Deprecated:       false,
 					Kind:             protocol.CompletionItemKindValue,
 					InsertTextFormat: protocol.InsertTextFormatPlainText,
 					InsertTextMode:   protocol.InsertTextModeAsIs,
 				}
 				if len(item.Label) > maxCompletionLabelLength {
 					item.InsertText = item.Label
 					item.Label = hiddenText + item.Label[len(item.Label)-maxCompletionLabelLength-len(hiddenText):]
 				}
 				response.Result = append(
 					response.Result,
 					item,
 				)
 			}
 		case parsers.StateAfterColon:
 			for _, selector := range *selectors {
 				item := protocol.CompletionItem{
 					Deprecated: false,
 					Detail: fmt.Sprintf(
@@ -130,19 +131,19 @@
 					Label: fmt.Sprintf(
 						`"%s"`,
 						selector.Value,
 					),
 				}
 				if len(item.Label) > maxCompletionLabelLength {
 					item.InsertText = item.Label
 					item.Label = hiddenText + item.Label[len(item.Label)-maxCompletionLabelLength-len(hiddenText):]
 				}
 				response.Result = append(
 					response.Result,
 					item,
 				)
 			}
 		default:
 			return nil, nil
 		}
 		return response, nil
 	}

tools/seltabls/pkg/lsp/message.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/conneroisu/seltabl/tools/seltabls/pkg/lsp/methods"
 	"github.com/conneroisu/seltabl/tools/seltabls/pkg/safe"
+	"go.lsp.dev/protocol"
 )
 
 var (
@@ -34,7 +35,7 @@ type Response struct {
 
 // Method returns the method for the response
 func (r Response) Method() methods.Method {
-	return methods.MethodInitialize
+	return protocol.MethodInitialize
 }
 
 // Notification is a notification from a LSP

tools/seltabls/pkg/parsers/selectors.go

@@ -24,9 +24,7 @@ func GetAllSelectors(doc *goquery.Document) ([]string, error) {
 		str := getSelectorsFromSelection(s)
 		if str != empty {
 			if !contains(strs, str) {
-				if doc.Find(str).Length() == 0 {
-					strs = append(strs, str)
-				}
+				strs = append(strs, str)
 			}
 		}
 	})
@@ -48,7 +46,7 @@ func getSelectorsFromSelection(s *goquery.Selection) string {
 	currentSelector := singleSelector(s)
 	// Combine the parent and current selectors
 	if parentSelector != empty && currentSelector != "" && parentSelector != currentSelector {
-		return parentSelector + currentSelector
+		return parentSelector + childsep + currentSelector
 	} else if parentSelector != empty && currentSelector == "" {
 		return parentSelector
 	}
@@ -99,9 +97,9 @@ func GetSelectors(
 	if err != nil {
 		return nil, fmt.Errorf("failed to insert html: %w", err)
 	}
-	URL, err := db.Queries.InsertURL(
+	URL, err := db.Queries.UpsertURL(
 		ctx,
-		master.InsertURLParams{Value: url, HtmlID: HTML.ID},
+		master.UpsertURLParams{Value: url, HtmlID: HTML.ID},
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to insert url: %w", err)

tools/seltabls/pkg/safe/map.go

@@ -68,6 +68,7 @@ func (sm *Map[K, V]) String() string {
 	return b.String()
 }
 
+// limitString limits the length of a string to the given limit.
 func limitString(s string, limit int) string {
 	if len(s) > limit {
 		return s[:limit] + "..."